icon maps
Merge remote-tracking branch 'origin/master'

Conflicts:
	public_html/site/img/bigcity.png
Create request parte 1