Trip:
- remove objects belong to Trip in com.smarttravel.contents
- modified  Trip models and adjusted Trip services
fixed missing files in previous commit