Map optimization
Merge branch 'map' into develop

Conflicts:
	app/models/item.rb