Merge branch 'master' into separate_search_panel

Conflicts:
	src/src.pro

diff --cc src/src.pro
index 2c72823,1063753..1cf0da4
--- 1/src/src.pro
--- 2/src/src.pro
+++ b/src/src.pro
@@@ -81,7 -81,7 +81,8 @@@ SOURCES += main.cpp 
      ui/routewaypointlistitem.cpp \
      ui/routewaypointlistview.cpp \
      user/user.cpp \
-     ui/locationsearchpanel.cpp
++    ui/locationsearchpanel.cpp \
+     ui/textmodifier.cpp
  HEADERS += application.h \
      common.h \
      coordinates/geocoordinate.h \
@@@ -164,7 -164,7 +165,8 @@@
      ui/routewaypointlistitem.h \
      ui/routewaypointlistview.h \
      user/user.h \
-     ui/locationsearchpanel.h
++    ui/locationsearchpanel.h \
+     ui/textmodifier.h
  QT += network \
      webkit
  DEFINES += QT_NO_DEBUG_OUTPUT