Prepare for first release
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/index.html
	dist/index.html
	dist/views/main.html