updating localisations
Merge branch 'master' of https://github.com/MarkUsProject/Markus
Merge branch 'master' of https://github.com/MarkUsProject/Markus
Fixes #1722
Added rspec files for annotations.
Fixed houndci suggestions for new rspec files
Added rspec test for AssignmentFile
Added line at end of file
adding rspec tests for image_annotations
Merge branch 'master' of https://github.com/MarkUsProject/Markus into imageAnnotationRSpec
fixing unwanted changes
formatting
fixed Hound formatting
more formatting
Removed old rake files.
Added newline to file
Added newline character to file
Added newline character to file
Migrated Rake test annotation_category_test to RSpec.
Delete old rake test file..