Fixed bluetooth bug, added numbers instead of words, and fixed multiple easing bug
Merge branch 'master' into nathan_develop

Conflicts:
	HotCold/INBeaconService.m
ios pebble most calls in and compiles