change database config for jenkins automatic
Merge branch 'develop' of https://github.com/quyetdd/canpass_draft into develop

Conflicts:
	config/database.yml