adding map application
before jumping to hit push
Integrated easi changes.

Had to comment out some deploy code for now.
Fix.
Merge remote-tracking branch 'github/master' into q3

Conflicts:
	mideaas-app/src/main/resources/mideaas.properties