bug fix
Merge remote-tracking branch 'origin/master'

Conflicts:
	chaplin/app/views/templates/report-modal.hbs