change the urls in template as write in urls file in parameter name
Merge remote-tracking branch 'origin/master'

Conflicts:
	itcook/templates/category_archive.html
change the name of button