updates
Merge branch 'master' of https://github.com/avalliani/betareturn

Conflicts:
	play/app/service/reports/impl/FeesOverTimeServiceImpl.java
refactored to have all generated from core app
added summary