Merge branch 'release/0.95'
placeholders for uft_staff_* functions
Add a test file to ensure that deployment works.
Remove test file.
Add a test file to ensure that deployment works.
Delete test file, deployment works.
Merge branch 'release/ckeditor-4'
Merge branch 'release/ckeditor-4'
Merge branch 'master' of ssh://cappucino.cc.com.au/home/claudinec/uft_site
rm field template - is this why ckeditor doesn't appear? No.
download ckeditor
update uft_units
remove non-working update functions in uft_units.install
update linkchecker
update mailchimp module
update pathologic
Merge branch 'feature/staff-profiles' into dev
placeholders for uft_staff_* functions
Merge branch 'dev' of brie:/srv/www/uft.claudinechionh.net/htdocs into dev
update location and year fields in units