0.1.2
Merge branch 'master' of https://github.com/nuysoft/Mock

Conflicts:
	dist/mock-min.js
	dist/mock-min.map
	dist/mock.js