Use monkey patching to fix mocker
Merge branch 'fix-mock'

Conflicts:
	models/customer.py
Merge branch 'master' of https://github.com/SwipeMe/SwipeMe