Merge branch 'develop' into release
changed map source to mapquest
Merge branch 'release' into develop