Cleaned up the css from conflict markers, added the ability to have threaded comments and removed the lowercase block titles style which confused some people.
Access control allows read/write settings for both Drupal Roles and Organic Groups (the later is optional)
Other changes include:
* Embed function no longer inserts a filter - HTML is used to allow greater compatibility with TinyMCE - meaning embedded images can be resized etc.
* Tree listing / refresh is now MUCH faster - following a complete rewrite of the tree build method.
* Properties screens have been improved
* Added properties screen for "directories"
* Loads and loads of bug fixes