V1.0
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/view1/view1.html