main.scala.html and app.js are updated.
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/views/index.scala.html
main.scala.html and app.js are updated
Merge remote-tracking branch 'origin/master'