user_confirm
Merge branch 'master' of https://github.com/wafflestudio/wabook

Conflicts:
	db/schema.rb