jshint with no errors

Signed-off-by: filipe garcia <filipe.c.garcia@gmail.com>
Merge branch 'refs/heads/master' into gh-pages

Signed-off-by: filipe garcia <filipe.c.garcia@gmail.com>

Conflicts:
	assets/js/report-back.js