scaffolding style
erge branch 'development' into indexpage

Conflicts:
	app/index.html