Manage image location using OpenStreetMap.
Merge branch 'master' of github.com:phimpme/android

Conflicts:
	Phimpme/Phimpme/src/main/java/com/phimpme/phimpme/Configuration.java
	Phimpme/Phimpme/src/main/java/com/phimpme/phimpme/SettingsActivity.java