Merge branch 'release/1.1.3' into develop
Tweaked file upload handling
Tweaked ckeditor config
Updated main_nav menu to allow slug based items
Prepped release
Merge branch 'release/1.1.4'