iii
Merge branch 'master' of https://github.com/themorecolor/okeyso

Conflicts:
	Gemfile
Merge branch 'master' of https://github.com/themorecolor/okeyso
Merge branch 'master' of https://github.com/themorecolor/okeyso
sss
Merge branch 'master' of https://github.com/themorecolor/okeyso

Conflicts:
	app/controllers/weixin/callback_controller.rb
Merge branch 'master' of https://github.com/themorecolor/okeyso
Merge branch 'master' of https://github.com/themorecolor/okeyso
Merge branch 'master' of https://github.com/themorecolor/okeyso
Merge branch 'master' of https://github.com/themorecolor/okeyso
Merge branch 'master' of https://github.com/themorecolor/okeyso
Merge branch 'master' of https://github.com/themorecolor/okeyso
Merge branch 'master' of https://github.com/themorecolor/okeyso
Merge branch 'master' of https://github.com/themorecolor/okeyso
Merge branch 'master' of https://github.com/themorecolor/okeyso
Merge branch 'master' of https://github.com/themorecolor/okeyso
Merge branch 'master' of https://github.com/themorecolor/okeyso
Merge branch 'master' of https://github.com/themorecolor/okeyso
Merge branch 'master' of https://github.com/themorecolor/okeyso
Merge branch 'master' of https://github.com/themorecolor/okeyso

Conflicts:
	app/controllers/weixin/callback_controller.rb