More
Report edits
Small changes
Small fix
Merge branch 'develop' of github.com:tshafer/orion into develop

Conflicts:
	app/views/frontend/layout.blade.php
Some changes
Images in reports