Ajax paging for trips in process
Merge remote-tracking branch 'origin/develop' into develop

Conflicts:
	src/main/webapp/WEB-INF/tiles/tiles-templates.xml