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

Conflicts:
	src/main/resources/spring-security.xml
	src/main/webapp/WEB-INF/web.xml
Merge branch 'master' of
https://github.com/karenhovhannisian/iguan_payment_api.git

Conflicts:
	src/main/webapp/WEB-INF/web.xml
Merge branch 'master' of
https://github.com/karenhovhannisian/iguan_payment_api.git

Conflicts:
	src/main/resources/spring-security.xml
	src/main/webapp/WEB-INF/web.xml
Merge branch 'master' of https://github.com/karenhovhannisian/iguan_payment_api.git
logout, new dtos and new actions
Merge branch 'master' of https://github.com/karenhovhannisian/iguan_payment_api.git