Timestamp
Prettied up the code and actually tied it into the data
Merging and also fixing a bug with the gui on the battery screen showing too early
Merge branch 'develop'