pre-merge
Merge branch 'master' of github.com:marcoraddatz/candyCMS-Core