Test
Test
Merge branch 'master' of https://github.com/amalkin/ToolkitPhoneGap

Conflicts:
	plugins/android.json
	www/index.html