First try to display marker for artworks on the map
Merge branch 'master' of https://github.com/Wallkers/Wallk

Conflicts:
	src/com/imac/wallk/LocationActivity.java
Merge branch 'master' of https://github.com/Wallkers/Wallk