maps, detail
mergin from server

Merge branch 'master' of github.com:niko1003/aod