testing
Merge branch 'gui_json' of github.com:marcoslin/PyAngo into flask_security

to test if we can merge
Resolved the conflict and added Git Merge section