Update server
Merge branch 'lifx' of https://github.com/ngreatorex/PebbleTextWatch into lifx