Repeated commit (switch branch problems)
Merge branch 'development' of git@github.com:laputski/mas.git into development

Conflicts:
	src/main/java/com/ocsico/mas/service/UserServiceImpl.java