Here we go
Merge branch 'master' of https://github.com/tyllyn/CanteenReport

Conflicts:
	backend-code/application/models/report.php