events and users tables instead of test
Merge branches 'master' and 'master' of https://github.com/mhommer/EDGE-Demo
Merge branch 'master' of https://github.com/mhommer/EDGE-Demo
Merge branch 'master' of https://github.com/mhommer/EDGE-Demo
Merge branch 'master' of https://github.com/mhommer/EDGE-Demo
reduce size of list events and decrease font of stitched elements
Merge branch 'master' of https://github.com/mhommer/EDGE-Demo

Conflicts:
	assets/www/js/index.js