continues with google map and bug fixes
Merge branch 'master' into development_l