Merge branch 'master' of github.com:borste/WiBo_GoogleFusionTables

Conflicts:
	README.md
Merge branch 'master' of github.com:borste/WiBo_GoogleFusionTables

Conflicts:
	README.md