pop add-to-trip out
Merge branch 'master' of github.com:haiwangcat/roadtrip

Conflicts:
	roadtrip/roadtrip/static/css/common.css
roll back