Admin files.
annotation_categories files
Merge branch 'master' of git://github.com/MarkUsProject/Markus into s3-html
Fix for admins.
Annotations files
API key files
Assignments files.
Automated tests files.
Merge conflicts
Merge conflicts
Merge branch 's3-html' of https://github.com/arkon/Markus into style-guide