shan
Merge branch 'master' of https://github.com/noachianark/study_phonegap

Conflicts:
	first_app/assets/www/index.html
	first_app/bin/first_app.apk
	first_app/bin/resources.ap_