add log out button.
Merge branch 'master' of github.com:haojianzong/zome

Conflicts:
	app/views/layouts/application.html.erb