deleted:    application/.idea/workspace.xml
	modified:   deliverables/architecture/model_dc.png
Merge branch 'master' of https://github.com/ziellim/Mayor-Pro

Conflicts:
	application/.idea/workspace.xml