gitignore updated
Merge branch 'master' of https://github.com/trinitymobile/mobile-publishing-android

Conflicts:
	.gitignore