fixed jshint issues
Merge remote-tracking branch 'origin/master'

Conflicts:
	js/view/EnergySkateParkBasicsView.js