added tripOrder and updated Bower components
Merge remote-tracking branch 'origin/master'