finishing category widget
Merge branch 'kadir' into gh-pages

Conflicts:
	category_widget/category.js