upgrade
renamed ing folder to images, so it is picked up in build. also removed package settings from metadata as it was causing build errors
Merge branch 'master' into 3.0

Conflicts:
	NativeContacts/NativeContacts.xds
	NativeContacts/app.json
	NativeContacts/metadata/resource/Library
	NativeContacts/metadata/resource/PackageSettings
	NativeContacts/metadata/view/FavoriteView
Merge pull request #7 from davestum/3.0

3.0