исправления
Merge remote-tracking branch 'origin/dev'

Conflicts:
	src/com/netcracker/libra/controller/LoginController.java
	src/com/netcracker/libra/controller/UsersController.java
	src/com/netcracker/libra/dao/UserPreferences.java