merge changes
Merge branch 'master' of https://github.com/keyboardr/WinkMeat

Conflicts:
	android/WinkMeat/AndroidManifest.xml
	android/WinkMeat/res/values/strings.xml