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

Conflicts:
	src/main/java/com/iguan/web/controller/AdminDailyReportsController.java
problem issue