modification of word.language.languageName instead of word.languageName
Merge pull request #23 from IFMO3512/languages

modification of word.language.languageName instead of word.languageName
Merge remote-tracking branch 'origin/master' into improvements-#20

Conflicts:
	web/src/main/webapp/view/pages/admin.html
	web/src/main/webapp/view/pages/user.html
	web/src/main/webapp/view/scripts/main.js
#20 some merge review