branch test
Merge branch 'master' of http://github.com/toerq/OSM-project
Merge branch 'master' of http://github.com/toerq/OSM-project
Merge branch 'master' of http://github.com/toerq/OSM-project