3
Merge branch 'master' of https://github.com/heartwave/Phonegap

Conflicts:
	7.jpg