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

Conflicts:
	scripts/elements.js
	views/reports/daily.html
Merge branch 'master' of
https://github.com/karenhovhannisian/iguan_payment.git

Conflicts:
	scripts/elements.js