fix custom manager inheritance.
change deserialization of None values
remove unused variables and imports
Hotfix #46 - recursively include all files in djmoney
Hotfix #46 - recursively include all files in djmoney
Merge branch 'master' of github.com:benjaoming/django-money
add tests package to setup.py
Merge branch 'master' of github.com:jakewins/django-money

Conflicts:
	djmoney/models/fields.py