update views and add integration testing for them
paginate trips list
merge with master, resolve conflicts