Added system vs user cpu
Merge branch 'master' into javier
Merge branch 'master' of https://github.com/FIU-SCIS-Senior-Project-2014-Fall/Web-Dashboard-for-Addigy