help in show resources
Added form for avatars
Just need a fix in viewing avatar inside showcategory
Merge branch 'master' of https://github.com/ging/vish
Fix
Added form for belongs
Last fix incontroller
Authorization for WorkshopActivities
Several bugs fixed on wactivities controllers
Authorization enhanced for Workshop Activities
avatar for show categories
Merge branch 'master' of https://github.com/ging/vish into storyrobin

Conflicts:
	app/assets/stylesheets/vish/layouts/show/_show.css.sass
	app/views/help/_help_show_resource.html.erb
	app/views/repositories/_form.html.erb
	app/views/users/_profile-info.html.erb
	db/schema.rb
Merge branch 'master' of https://github.com/ging/vish into storyrobin