Updated app to work with Pebble 2.x firmware
Merge branch 'develop'

Conflicts:
	.gradle/1.9/taskArtifacts/cache.properties.lock
	.gradle/1.9/taskArtifacts/fileHashes.bin
	.gradle/1.9/taskArtifacts/fileSnapshots.bin
	.gradle/1.9/taskArtifacts/outputFileStates.bin
	.gradle/1.9/taskArtifacts/taskArtifacts.bin
	.idea/workspace.xml
	Pebble/pebble_sifter/build/app_resources.pbpack
	Pebble/pebble_sifter/build/app_resources.pbpack.manifest
	Pebble/pebble_sifter/build/config.log
	Pebble/pebble_sifter/build/pebble-app.bin
	Pebble/pebble_sifter/build/pebble_sifter.pbw
	gradle/wrapper/gradle-wrapper.properties
Merge branch 'develop'