modified map size
Merge origin/master

Conflicts:
	application/controllers/ResponseOrg.php
icons for map.