Modifying routing-filter for locales for subdomains
Fix: making locales optional
Fix: tests
Removing unnecessary comment
Revert to old hash syntax in routes
Merge pull request #48 from danielstjules/pr/1331

Revert to old hash syntax in routes
Merge pull request #1331 from benjaminvialle/routing-filter

Routing filter
Simple_format was adding  <p> and </p> on new annotations.
When it was removed, the issue 1299 was solved.
Merge pull request #1351 from tiagochst/issue-1299

Closes #1299
Reverting the changes to make it possible hide an assignment from a student
Manage to fix the unknown attribute error
Merged app/models/assignment.rb conflict
Fix for issue 1333: me and @tiagochst implemented the <<hide assignment>> behavior
Merge branch 'master' of github.com:rafaspadilha/Markus
Merge branch 'master' into issue-1333