Import categories and tags as keywords.
Merge branch 'master' of github.com:SUSE/hackweek

Conflicts:
	app/views/projects/show.html.haml