Merge branch 'hotfix/0.2.2'
remove use of simplejson
Hotfix: Repaired email forms after wrong merge
Merge branch 'hotfix/0.2.3' into develop