before merge
Merge branch 'wip/reporting_reeng' of https://github.com/Factor-X/awac into wip/reporting_reeng

Conflicts:
	app/eu/factorx/awac/controllers/AdminController.java
merged master