before fix rama9
Merge branch 'master' of https://github.com/picnii/ananda-rush

Conflicts:
	service/Controller/ReportController.php