400 Test
Merge branch 'master' of https://github.com/joest67/jweixin

Conflicts:
	jweixin/views/callback.py