Views fix
Merge branch 'develop' of github.com:tshafer/orion into develop

Conflicts:
	app/views/frontend/reports/index.blade.php
Small fix
More
Merge branch 'develop' of github.com:tshafer/orion into develop