make app a real domain
Merge branch 'master' into with_button_click_spec

Conflicts:
	public/index.html