dashboard
Merge branch 'develop' of github.com:quyetdd/canpass_draft into develop
update login and dashboard
update
Merge pull request #12 from linhnt/develop

Develop
update source code
change database config for jenkins automatic
search and graph function
update highchart
Merge branch 'develop' of https://github.com/quyetdd/canpass_draft into develop

Conflicts:
	config/database.yml
delete redis_table
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