fix #18, jsonify requests
Merge branch 'master' into issue-18-jsonify

Conflicts:
	user/user_api.py
Merge pull request #19 from lisztli/issue-18-jsonify

fix #18, jsonify requests