Merge branch 'master' of git@github.com:merzbird/topadviser.git

Conflicts:
	src/ua/nure/ta/controller/MainController.java
	src/ua/nure/ta/controller/UserController.java