Merge branch 'release/0.95' into dev
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
ckeditor full 4.1.2
update wysiwyg to dev version
Merge branch 'release/ckeditor-4'
ignore .DS_Store
Merge branch 'release/ckeditor-4'