white space between nodes
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/views/app/index.scala.html