Merge branch 'hotfix/2.0.1'
hide current_user in new Trip
Merge branch 'hotfix/2.0.2' into develop