sdfsdffds
Merge remote-tracking branch 'origin/master'

Conflicts:
	DemoPhoneApp/src/com/wafflehaus/wearuatt/phone/ContactListActivity.java
Merge remote-tracking branch 'origin/master'

Conflicts:
	DemoPhoneApp/src/com/wafflehaus/wearuatt/phone/ContactListActivity.java
Merge remote-tracking branch 'origin/master'

Conflicts:
	wearable-1.0.0/bin/wearable-1.0.0.jar
Merge remote-tracking branch 'origin/master'

Conflicts:
	DemoPhoneApp/src/com/wafflehaus/wearuatt/phone/ContactListActivity.java
	wearable-1.0.0/bin/wearable-1.0.0.jar