Merge branch 'UI-work'

Conflicts:
	Gemfile.lock
Merge branch 'UI-work'

Conflicts:
	Gemfile.lock
working version
Merge branch 'UI-work'
items display
with maps
Merge branch 'UI-work'