Merged dev into master
Merged dev into master
Add icons on menu lists...
fix a typo
fix README
Merge branch 'master' of bitbucket.org:hoaivubk/gts_nodejs
fix README
Merge branch 'dev'

Conflicts:
	README.md
	client/src/common/directives/date-range/date-range.js
	server/views/dashboard.hbs
fix conflict
Merge branch 'dev'
Sprint 1
update user page
Merge branch 'master' into dev
update permission + change user password
add some field
hot fix no event bug
hotfix login error
admin can change pass without entering current password
added datapushurl to account
fix a typo