Fixed merge conflict
Fixed merge conflict
Merge pull request #77 from mshamash/master

Work on map
Merge remote-tracking branch 'origin/master'
Fixed conflicts
Merge pull request #29 from stephandev/master

Removed communications storyboard