misc changes
Fixes to conflicts
Cleaned up files and added necessary jquery-ui files
Route manager added to edit tab
added delete function to Route Manager
misc updates