bug removed
Merge remote-tracking branch 'origin/master'

Conflicts:
	wiki/urls.py
Hamed: 3 line in "wiki" have been changed.
 1. url named "register" changed to "wiki-register" (url names should start with app name)
 2. "cat" removed from fields in ProductForm

3. Category inserted again