pre-merge
Merge branch 'master' of github.com:marcoraddatz/candyCMS-Core
fixed bug that always displayed json error messages
quickfix for wrong json information - this has to be improved