Working on the unifying the data model
Merge branch 'develop' into Tyler-Dev-DataModel
Added depticon icon when a department is selected
Merge branch 'develop' into Tyler-Dev-DataModel and added proper depticon on creating event

Conflicts:
	www/templates/add-event.html
Merge pull request #20 from thortek/Tyler-Dev-DataModel

Added remove button, fixed the data model when creating events to properly add icon