Removes double colons.
Updates version to 0.8.0a2.
Fixed typo.
Merge branch 'master' into version/0.8

Conflicts:
	lfs/__init__.py
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
fix url
Merge branch 'master' of github.com:diefenbach/django-lfs
added default email (user.email) value for adressess
Merge remote-tracking branch 'upstream/master'
Merge pull request #149 from restless/master

added default email (user.email) value for adressess
Fixes variant managment; makes all tests pass.
Adds schema and data migration for Property field 'variants'.
Merge remote-tracking branch 'upstream/master'
Merge branch 'master' of github.com:pigletto/django-lfs