Merge branch 'feature/issue-101-interactionmachine-api-request-should-throw-an-error-for-api-failures' into feature/issue-99-add-contact-and-contactstore
Merge branch 'develop' into feature/issue-99-add-contact-and-contactstore
Stub out ContactStore (with docstrings)
Stub out ContactStore tests
Add a ContactStore to InteractionMachine, using 'ussd' as the config default for delivery_class
Implement the basics for ContactStore
Add test to check that we set up the im's config store in InteractionMachine.setup()
Change ContactError to ValidationError, a more general error for all models
Add a basic Group model
Validate Contact.key and Contact.user_account
Use 'user1' for the user_account in the Group model's tests
Merge branch 'feature/issue-114-fix-odd-things-in-contacts-tests' into feature/issue-103-validate-contact-key-and-contact-user-account

Conflicts:
	test/test_contacts/test_dummy.js
Merge branch 'feature/issue-114-fix-odd-things-in-contacts-tests' into feature/issue-103-validate-contact-key-and-contact-user-account

Conflicts:
	test/test_contacts/test_api.js
Merge branch 'feature/issue-114-fix-odd-things-in-contacts-tests' into feature/issue-103-validate-contact-key-and-contact-user-account
Merge branch 'feature/issue-114-fix-odd-things-in-contacts-tests' into feature/issue-99-add-contact-and-contactstore

Conflicts:
	test/test_contacts/test_api.js
Merge branch 'feature/issue-114-fix-odd-things-in-contacts-tests' into feature/issue-112-add-a-basic-group-model

Conflicts:
	test/test_contacts/test_api.js
Merge branch 'feature/issue-114-fix-odd-things-in-contacts-tests' into feature/issue-113-add-basics-for-dummy-groups-resource
Test stubs for DummyGroupsResource
Merge branch 'develop' into feature/issue-99-add-contact-and-contactstore
Merge branch 'develop' into feature/issue-103-validate-contact-key-and-contact-user-account