change # 12

Tasks needed to be done: 1. social network hyperlink; 2. info-window
didn't show up for polygon layer
Merge remote-tracking branch 'origin/master'

Conflicts:
	layers.xml
	script/CSV2JSON.js
	script/main.js