Use empty string instead of None in templates
Add the ability to suppress all interation
Add the ability to suppress all interation
Merge branch 'automation' of github.com:CheeseTheMonkey/localshop into automation

Conflicts:
	CHANGES
	localshop/management/commands/init.py
Don't include external requirement lines when parsing requirements files
Fix init command failing due to empty SECRET_KEY
Merge pull request #96 from jalaziz/fix_init

Fix init command and setup
Use requests for xmlrpc calls in order to support more proxy settings.
Updated the requests version to be able to use more proxies settings.
Fix spelling
Update all packages to the most recent versions
Fix compat with Django 1.6
Merge pull request #93 from CheeseTheMonkey/automation

Allow automation by surpressing superuser creation
Merge branch 'develop' into feature/sync_without_xmlrpc

Conflicts:
	requirements.txt
Merge pull request #82 from daevaorn/index-template-fix

Use empty string instead of None in templates
Merge pull request #101 from simlun/develop

Fix spelling
Fix for python3
Merge pull request #1 from mvantellingen/develop

resync from original fork