Fix indentation
Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/master' into addedblocks

Conflicts:
	app/index.html