Removes double colons.
Updates version to 0.8.0a2.
Fixed typo.
manual merge of filters branch
fix unicodedecodeerror for cookies by using cookie_date as sessions middleware does
fix property option adding
set height for tinymce fields
Check if cart has been initiated in refresh_cart view
Merge pull request #147 from DNX/master

Check if cart has been initiated in refresh_cart view
Merge pull request #143 from diefenbach/filters_0.8

Manual merge of filters branch.
Fixes all tests.
Merge branch 'master' into version/0.8

Conflicts:
	lfs/__init__.py
replace simplejson with json; remove unused imports
fix url
Adds variants to Property; removes display_no_results from Property.

Conflicts:
	lfs/catalog/views.py
	lfs/core/management/commands/lfs_migrate.py
	lfs/manage/product/variants.py
	lfs/static/js/lfs.manage.js
	lfs/templates/manage/product/variants.html
Adds variants to Property; removes display_no_results from Property.

Conflicts:
	lfs/catalog/views.py
	lfs/core/management/commands/lfs_migrate.py
	lfs/manage/product/variants.py
	lfs/static/js/lfs.manage.js
	lfs/templates/manage/product/variants.html
Updates doc.
Updates doc.
Updates version to 0.9.0a1.
replace simplejson with json; remove unused imports