First commit for in-app billing API
fix double mActivity declaration
Merge branch 'master' of github.com:kivy/python-for-android into billing-api
add fixes from json / purchasetoken: http://stackoverflow.com/questions/12002788/subscription-sample-missing-json-parsing-of-purchasetoken
Merge branch 'master' into billing-api

Conflicts:
	docs/source/android.rst
	recipes/android/src/android.pyx
	recipes/android/src/android_jni.c
	src/build.py
	src/src/org/renpy/android/PythonActivity.java
	src/templates/AndroidManifest.tmpl.xml
Merge branch 'master' of https://github.com/kivy/python-for-android into billing-api
Merge branch 'billing-api' of git://github.com/bob-the-hamster/python-for-android