mask Gemfile.lock schema.rb
commit sdkuser locale; add openfire table
Merge branch 'master' of https://github.com/bladelee/mydevise into home

Conflicts:
	.gitignore
	config/locales/model.zh-CN.yml
	config/routes.rb