update
Merge branch 'develop' of https://github.com/quyetdd/canpass_draft into develop

Conflicts:
	Gemfile
Merge pull request #21 from bangsep/develop

update