burgundy logo with border
update fields in unit type
update various staff profile settings
Merge branch 'feature/staff-profiles' into dev
only display events that are not in the past
update field templates for learning outcomes and recommended reading
ckeditor full 4.1.2
field templates - remove lists
field templates - remove lists
update wysiwyg to dev version
Merge branch 'release/ckeditor-4' into dev
ignore .DS_Store
Merge branch 'release/ckeditor-4' into dev
WYSIWYG problem? Trying EpicEditor. Still problem?
Merge branch 'feature/unit-templates' into dev
Merge branch 'feature/unit-templates' into dev
Merge branch 'dev' of brie:/srv/www/uft.claudinechionh.net/htdocs into dev