Internal Update.
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/assets/javascripts/main.coffee
	app/views/page.scala.html