Cleanup
Update status messages
Merge branch 'master' of https://github.com/ethereum/website

Conflicts:
	assets/static/js/app.js