update routes and application js files for new models
update application js files for datepicker image
updated dirApp changes for conflict resolution
fixed unmerged dirApp files
reupdate conflicted controllers & views
added theirs to fix conflicts
updated exhibitor and sponsor code