should fix the problem
Merge pull request #45 from arieldiamond/fix_trip_view

should fix the problem
trips calendar
Merge pull request #46 from arieldiamond/map_calendar

trips calendar
activities calendar success
javascript improvements
more javascript
Merge pull request #47 from arieldiamond/activities_calendar

Activities calendar
merge master
nested forms work, need to finish editing