Merge pull request #1027 from jdalphon/trying_to_release

Fixing some odd issues with ckeditor.
Merge pull request #1028 from jdalphon/trying_to_release

We did not have the responsive css from bootstrap. Adding it in
Fixing upload pages to be bootstrap3ish