Issue 7
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/main/java/ru/hse/esadykov/controller/UsersController.java
	src/main/java/ru/hse/esadykov/dao/UserDao.java
Merge remote-tracking branch 'origin/master'