Merge branch 'github'
Merge branch 'develop'
Update here.com api credentials
Merge branch 'develop'
Fix a issue where distance preference was not being saved correctly.
Merge branch 'develop'
Merge pull request #1 from bengalaviz/master

Master