Git ignore android bin/ and gen/ files
Merge branch 'master' of https://github.com/DataSplice/CordovaSkeletonApp

Conflicts:
	.gitignore