Update for Build Phone Gap compatibility
Merge branch 'master' of https://github.com/jingdoli/doli-mobile-android

Conflicts:
	www/js/index.js