javascript/editors/ckeditor/body.js, javascript/editors/ckeditor/head.js
- Moved custom configuration setting to head.js and out of body.js.

mod/block/*
- Clicking Add block in mini admin opens a dialog box instead of a new window.

mod/filecabinet/class/Image.php
- fixed error notice.

mod/miniadmin/class/MiniAdmin.php
- Shifted code around to prevent error on empty miniadmin commands

mod/pagesmith/javascript/pageedit/script.js
- Custom config removed as it is now in the head of the editor

themes/bootstrap/css/local.css
- label tag made to display:inline. Bootstrap had it as a block but we have always used it as an inline.
Merge branch 'master' of github.com:AppStateESS/phpwebsite