updating localisations
Merge branch 'master' of https://github.com/MarkUsProject/Markus
Merge branch 'master' of https://github.com/MarkUsProject/Markus
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
Fixed formatting.
Removed AssignmentFile rake test
deleting image_annotation_test
Merge branch 'master' of https://github.com/MarkUsProject/Markus into imageAnnotationRSpec
formatting
newline
formatting
formatting
Fixing formatting