updating localisations
Merge branch 'master' of https://github.com/MarkUsProject/Markus
Merge branch 'master' of https://github.com/MarkUsProject/Markus
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
deleting image_annotation_test
Merge branch 'master' of https://github.com/MarkUsProject/Markus into imageAnnotationRSpec
formatting
newline
formatting
formatting
Merge branch 'master' of https://github.com/MarkUsProject/Markus into imageAnnotationRSpec
updating rspec file
formatting
Merge pull request #1785 from nathanychow/imageAnnotationRSpec

Image annotation r spec