sync
sync
Merge remote-tracking branch 'origin/master'

Conflicts:
	bin/R.txt
	bin/WECoyoteChat.apk
	bin/classes.dex
	bin/classes/com/wecoyotechat/MainActivity.class
	bin/classes/com/wecoyotechat/R$id.class
	bin/classes/com/wecoyotechat/R$integer.class
	bin/classes/com/wecoyotechat/R$layout.class
	bin/classes/com/wecoyotechat/R$menu.class
	bin/classes/com/wecoyotechat/R$string.class
	bin/classes/com/wecoyotechat/R$style.class
	bin/classes/com/wecoyotechat/R$styleable.class
	bin/classes/com/wecoyotechat/SignupActivity.class
	bin/dexedLibs/AndroidSDK-63477d5887f85c6c9ada8d94a5653f91.jar
	bin/dexedLibs/android-support-v4-6980332326e0b78fb4dfa293bb861c2f.jar
	bin/dexedLibs/android-support-v7-appcompat-23c6c1bbca70bf62d386bc2b9667f595.jar
	bin/dexedLibs/appcompat_v7-da7f2e87524e345543048f8345f45fcd.jar
	bin/jarlist.cache
	bin/resources.ap_