Merge branch 'master' into indicator

Conflicts:
	src/src.pro

diff --cc src/engine/engine.cpp
Simple merge

diff --cc src/engine/engine.h
Simple merge

diff --cc src/map/mapcommon.h
Simple merge

diff --cc src/map/mapengine.cpp
Simple merge

diff --cc src/map/mapscene.cpp
Simple merge

diff --cc src/map/osm.h
Simple merge

diff --cc src/src.pro
index 1848c6b,18b79dc..16b9a21
--- 1/src/src.pro
--- 2/src/src.pro
+++ b/src/src.pro
@@@ -67,7 -67,7 +67,8 @@@ SOURCES += main.cpp 
      ui/listitemdelegate.cpp \
      ui/friendlistitemdelegate.cpp \
      ui/searchdialog.cpp \
-     ui/indicatorbuttonpanel.cpp
++    ui/indicatorbuttonpanel.cpp\
+     routing/geocodingservice.cpp
  HEADERS += application.h \
      common.h \
      engine/engine.h \
@@@ -135,7 -135,8 +136,9 @@@
      ui/friendlistitemdelegate.h \
      ui/listcommon.h \
      ui/searchdialog.h \
-     ui/indicatorbuttonpanel.h
++    ui/indicatorbuttonpanel.h\
+     error.h \
+     routing/geocodingservice.h
  QT += network \
      webkit
  

diff --cc src/ui/mainwindow.cpp
Simple merge

diff --cc tests/coordinates/scenecoordinate/testscenecoordinate.cpp
Simple merge