Changed titles of products and categories
Reset db
Merge remote-tracking branch 'origin/iter4' into iter4

Conflicts:
	db.sqlite3