merge
Merge branch 'master' of
https://github.com/karenhovhannisian/iguan_payment_api.git

Conflicts:
	src/main/java/com/iguan/model/persistence/entity/User.java
renames/deletes for projects and roles
admin user controller