users view with stats
Merge remote-tracking branch 'upstream/master' into fitbit_reg

Conflicts:
	routes.js
	views/users.hjs