Added speed chart and status chart
bower resolved
Merge branch 'hotfix.changepass' into dev
reset password
reset password
ignore now work
add allow notify select box
fixed
Merge branch 'hotfix/report-time-from' into dev
fixed overflow device list
Merge branch 'hotfix/report-time-from' into dev
hot fix
merge gts_nodejs_uk to gts_nodejs
Merge branch 'master' of bitbucket.org:hoaivubk/gts_nodejs
merged uk fork
Merge branch 'dev' of bitbucket.org:hoaivubk/gts_nodejs into dev

Conflicts:
	client/src/app/admin/device/edit-device.tpl.html
	client/src/app/admin/device/view-device.tpl.html
	client/src/app/map/monitor-map.js
	client/src/sass/core.sass
	client/src/sass/home.sass
	npm-debug.log
	server/libs/tracker.js
	server/routes/api/v1/reports.js
	server/routes/auth.js
	server/routes/main.js
	server/views/dashboard.hbs
	server/views/index.hbs
fixed conflict
fix infinite redirect
merged
fixed conflict