Fixes permissions block smarty plugin so we don't ALWAYS load the admin-global stylesheet in ALL templates with a permissions block and now only loaded if the permissions block is being displayed.
(cherry picked from commit fbb6c69)
Updates copyright to include 2014
(cherry picked from commit 2617254)
remove some 1.0 code and allows for detection of non-apache servers (to not set sef_urls on during install)
Updates text inline edit views to better configure ckeditor adding recent updates to ckeditorcontrol
(cherry picked from commit 2be26d5)
Merge branch 'develop' into revisions