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

Conflicts:
	src/com/netcracker/libra/controller/LoginController.java