modified js for debugging
debug js
Merge branch 'jsbranch' into frontend

Conflicts:
	app/views/index.scala.html
	public/javascripts/frontend/application.js