Merge branch 'refactor' into prod
Update
Merge branch 'FullScreenMap' into prod
Remove unecessary gem