added reports model/controller and couple views
got mercury working
work in progress
precompile assets
Used cocoon to create reports
Added photo upload
merge conflicts