updating localisations
fix #1701, nested forms don't work, added class for second form_tag
fix #1701, formatting
Merge branch 'master' of https://github.com/MarkUsProject/Markus into issue1701
Merge branch 'master' of https://github.com/MarkUsProject/Markus
Merge branch 'master' of https://github.com/MarkUsProject/Markus into issue1701
Merge branch 'master' of https://github.com/MarkUsProject/Markus
Fixes #1722
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
Merge branch 'rspec-conversions'
Migrated Rake test annotation_category_test to RSpec.
Delete old rake test file..
Changed should to expectation.