Merge branch 'master' into map

Conflicts:
	src/images.qrc
	src/map/mapfetcher.cpp

diff --cc res/images/zoom_in.png
index 0000000,0000000..0c8fd51
new file mode 100755 (executable)
Binary files differ

diff --cc res/images/zoom_out.png
index 0000000,0000000..8b45cb5
new file mode 100755 (executable)
Binary files differ

diff --cc src/map/mapfetcher.cpp
index a7de3f8,731a123..5818906
--- 1/src/map/mapfetcher.cpp
--- 2/src/map/mapfetcher.cpp
+++ b/src/map/mapfetcher.cpp
@@@ -75,7 -75,7 +75,11 @@@ bool MapFetcher::loadImageFromCache(con
  
          QNetworkCacheMetaData metaData = cache->metaData(url);
  
++<<<<<<< HEAD:src/map/mapfetcher.cpp
 +        if (metaData.expirationDate().isValid()) {
++=======
+         if ((metaData.expirationDate().isValid()) && (url.isValid())) {
++>>>>>>> master:src/map/mapfetcher.cpp
  
              if (metaData.expirationDate() < QDateTime::currentDateTime()) {
                  cache->remove(url);
@@@ -83,7 -83,7 +87,11 @@@
              }
          }
  
++<<<<<<< HEAD:src/map/mapfetcher.cpp
 +        QIODevice *cacheImage = m_manager->cache()->data(url);
++=======
+         QIODevice *cacheImage = cache->data(url);
++>>>>>>> master:src/map/mapfetcher.cpp
  
          if (cacheImage) {
              QImage image;

diff --cc src/src.pro
Simple merge