Merge branch 'master' of https://github.com/irfan4/UAEGreenApp

Conflicts:
	UAEGreenApp/ERAppDelegate.m
Change
updated ignore list