Fix a couple issues in the file uploader widget for CKeditor
Merge branch '2.3/develop' of github.com:pyrocms/pyrocms into 2.3/develop
Fix the queries (using old model syntax)