UI Changes

Changed Sleep and BP screen
Sleep/BP

UI changes
Merge branch 'master' of https://github.com/Project-THOR/Project-Thor

Conflicts:
nbproject/private/private.properties
nbproject/private/private.xml
Sleep Screen

Sleep
Merge branch 'master' of https://github.com/Project-THOR/Project-Thor

Conflicts:
	nbproject/private/private.properties
	nbproject/private/private.xml