jackrk/EnergyYardstick — pull request #19 by jackrk (2014-04-17 19:36:29+00:00)
Title: Mockup ui merge 

Merging to master