Update for IDE
Merge branch 'master' of https://github.com/jsworks/sencha-phonegap

Conflicts:
	.gitignore