more devise
Merge branch 'master' of github.com:cubecul/hk-ph-project

Conflicts:
	.DS_Store
	app/.DS_Store
	app/views/layouts/_header.html.erb