hybernate config's
resurrecting master branch
resurrecting master branch
Merge branch 'master' into develop

Conflicts:
	pom.xml
	src/main/java/roi/rtc/webservices/user/MainService.java
merging
merging
add search by login
add roles and default user as admin
troll
Merge branch 'editions'
create
Merge branch 'master'

Conflicts:
	src/main/java/roi/rtc/webservices/user/MainService.java
	src/main/java/roi/rtc/webservices/user/entity/User.java