Conflicted buglist fixed
Tweaks made
Tweaks made
Tweaks made
Merge pull request #83 from kaustabh/master

Conflicted buglist fixed
use flask.jsonify instead of custom json encode function
Merge pull request #84 from parkouss/use_flask_jsonify

use flask.jsonify instead of custom json encode function
exit when done
merge from jmaher master