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

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