Changed to modernmedia from druid628
Merge branch 'master' of https://github.com/dubcanada/exacttarget

Conflicts:
	composer.json