Move ckedit js script tag to head, wasn't loading
Merge branch 'design'