Add map markers from web
New job for build maps (copy to build directory)
Main activity of application
Merge remote-tracking branch 'origin/master'

Conflicts: