Minor changes to controller templates
Standard Merge

Merge branch 'master' of https://github.com/Marist-OpenFlow/floodlight-dangerzone
Trying to get uptimetpl.html to display the date properly. Conflicts are occurring at the moment, but I am not positive on what is causing them