implemented javascript for liveGraph
merge from master(aaron changes)
merge from master(aaron)
merge console for comp page
merge aaron's push to master
aaron merge minor
aaron merge minor
update site wide margins. Add styles to admin views