Added functionality to cancel button for the search bar
Merge branch 'develop' of https://github.com/thortek/dgm4790-spring2014 into develop
Updated the department list
Forgot to alphabetize the departments - done now
Fixed image paths so that icons show up.
Pushing the dean-home.html up
Merge branch 'develop' of https://github.com/thortek/dgm4790-spring2014 into develop

Conflicts:
	www/templates/dean-home.html
Updated dean-home.html
mergeTest
Merge pull request #13 from thortek/mergetest

mergeTest
Edited dean-home to change the footer back to the dark color and switched icons
changed tab for pull request test2
Update dean-home.html

Changing it back to </tab> from </tab1234>
Merge pull request #14 from thortek/mergetest2

changed tab for pull request test2 from </tab1234>
Add styling to event-detail.html
Merge branch 'develop' into Tyler-Dev-DataModel