Merge pull request #15 from bangsep/develop

Develop
import csv
Merge pull request #16 from KhanhLD/develop

import csv
Update database.yml
fix database.yml
Merge pull request #19 from johnny-miyake/develop

fix database.yml
Merge branch 'develop' of https://github.com/quyetdd/canpass_draft into develop

Conflicts:
	config/database.yml