Add trip and guide functionality
Merge branch 'master' of github.com:ging/smart_city_guide