update login function and add filter roles
Merge pull request #9 from linhnt/develop

update login function
Promotion - draft
Merge pull request #10 from KhanhLD/work

Promotion - draft
add multi language
Merge pull request #11 from linhnt/develop

add multi language
TDD for User
Merge pull request #8 from HoangQuan/work1

TDD for User
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