Did some button stuff
Merge branch 'master' into frontend_data

Conflicts:
	app/views/index.server.view.html