items mixin
new items
more and more style
items categories
events item
new style add new
add items ok
add oky doky
user item
small items
user small items
items
icons no fontawesome
Merge branch 'master' of github.com:ging/vish into redesign_items

Conflicts:
	app/views/excursions/_excursion-add.html.erb
	app/views/repositories/_resource-add.html.erb
	app/views/users/_user.html.erb
Fix conflicts for merge
Merge branch 'master' of github.com:ging/vish into redesign_items
Merge branch 'master' of github.com:ging/vish into redesign_items
timeline views
mixin items
Added thumbnails