restructure the organization Module object
Merge branch 'master' of https://github.com/miamidade/OEM-Application

Conflicts:
	app/grails-app/views/organization/_show.gsp
clean up views