init project
Merge branch 'master' of github.com:JoshuaChi/android-phonegap-photoshare

Conflicts:
	.gitignore