add modules
Merge branch 'backend' into mmoroz-bg

Conflicts:
	app/app.rb
	app/scripts/collections/navMenu.js
	app/scripts/localization/js/dropdownLib.js
	app/scripts/routes/navMenu.js
cleaning code & add localisation
fix post/put in subject grid
minor changes and cleaning code
Merge branch 'mmoroz-bd' into backend
Merge remote-tracking branch 'origin/backend' into backend

Conflicts:
	app/scripts/collections/navMenu.js