Make alarm settings visible on all pages
Compare temperatures to alarm trip and reset points
Merge LiveCardService changes
Merge branch 'master' of https://github.com/keyboardr/WinkMeat.git

Conflicts:
	android/WinkMeat/src/com/winkmeat/glass/LiveCardService.java