Fixing issue #1: Unclear error is displayed when the data connection doesn't work
Fixes #1 : Unclear error is displayed when the data connection doesn't work
Merge branch 'master' of https://github.com/thompsnm/PebbleSifter
Removed .gitignore from base directory
Merge branch 'master' into develop
Updated app to work with Pebble 2.x firmware
Added .gitignore
Removed untracked files
Added .gitignore file
Removed .idea directory from git
Updated .gitignore
Removed .gradle directory from git
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
Removed unnecessary lines
Merge branch 'develop'
Dynamically populating the sifter menu in the Pebble App
Removed generated build files from git