Merge branch 'master' into laura
sectors' symbol texts
Merge branch 'master' into laura

Conflicts:
	Unicef/InfoWindow.pde
Merge branch 'laura'