Fixes
Merge branch 'master' of github.com:spacelis/qgis-openlayers-plugin

Conflicts:
	openlayers/openlayers_plugin_layer_type.py