Fixed uptime()
Merge branch 'master' of github.com:dsolstad/Infoscreen-Server