modals
Merge branch 'ssupgrade' of github.com:ging/vish into ssupgrade

Conflicts:
	app/views/categories/_form.html.erb
	app/views/repositories/_form.html.erb
Fix forms
Merge branch 'ssupgrade' of github.com:ging/vish into ssupgrade