Adrian's transport stuffs!
Merge branch 'master' of https://github.com/tdimeco/PolytechGoodDeal.git
connerie
Merge branch 'master' of https://github.com/tdimeco/PolytechGoodDeal.git

Conflicts:
	src/main/app/mule-app.properties
	src/main/app/mule-deploy.properties