Remove recursinve inclusion of Trip in Triplocation json
Remove unused JQuery.ui JS and CSS
Merge branch 'backbone' into development