Merge branch 'master' of https://github.com/jtrovato/starfish-avocado

Conflicts:
	android_app2/bin/AndroidManifest.xml
	android_app2/bin/R.txt
	android_app2/bin/classes.dex
	android_app2/bin/resources.ap_
	android_app2/bin/starfish.apk
Merge branch 'master' of https://github.com/jtrovato/starfish-avocado

Conflicts:
	android_app2/bin/R.txt
	android_app2/bin/classes.dex
	android_app2/bin/resources.ap_
	android_app2/bin/starfish.apk
Merge branch 'master' of https://github.com/jtrovato/starfish-avocado

Conflicts:
	android_app2/bin/AndroidManifest.xml
	android_app2/bin/R.txt
	android_app2/bin/classes.dex
	android_app2/bin/resources.ap_
	android_app2/bin/starfish.apk