Updated model and view
Merge branch 'master' of github.com:andwin/gitflow-repo-report

Conflicts:
	models/report.rb