Merge branch 'master' of https://github.com/juanique/django-chocolate
Merge branch 'master' of https://github.com/juanique/django-chocolate
Merge branch 'master' of https://github.com/juanique/django-chocolate
Now the MockupData.set method accepts the None value
Replaced the 'from api import *' statement for 'from api import api'

Modified the test_key_can_equal_resource_name so it no longer uses the
imported modules to berify the resource names
New test to validate data with None attributes
Minor redaction fixes on blog/tests.py commments
Merge pull request #13 from thagat/master

 Now the MockupData.set method accepts the None value