web
web
Merge pull request #13 from IFMO3512/webcommits

Webcommits
Merge remote-tracking branch 'origin/master' into web

Conflicts:
	api/pom.xml
	api/src/main/java/com/fivehundredtwelve/langassist/Languages.java
	api/src/main/java/com/fivehundredtwelve/langassist/User.java
	api/src/main/java/com/fivehundredtwelve/langassist/Word.java
	web/pom.xml
	web/src/main/java/com/fivehundredtwelve/langassist/controller/rest/TranslatorController.java
	web/src/main/java/com/fivehundredtwelve/langassist/controller/rest/UserController.java
	web/src/main/webapp/WEB-INF/applicationContext.xml