new modules
new modules
add localization
fixing module teacher_subject
fix edit function
Merge branch 'backend' into mmoroz-bg

Conflicts:
	app/public/json_files/ua.json
	app/scripts/localization/js/dropdownLib.js
	app/scripts/localization/ua.json
minor fixes
fixing
some fixing
cleaning code
Merge pull request #15 from vdanyliv/mmoroz-bg

Mmoroz bg
Merge remote-tracking branch 'origin/backend' into lvuiui-79

Conflicts:
	app/app.rb