Update js/m2.metrics.js
Update js/m2.main.js
Update index.html
Milestone 2.3

metric restructure. Move display logic away from xsjs files to client.
Add missing files
File changes preparing for merge
Merge prep
Added Clock metric and fixed user/system alerts

fixes #29
v2.3 Commit