Merge remote-tracking branch 'upstream/master' into v1.1.0
Merge remote-tracking branch 'upstream/master' into v1.1.0
Upgraded CKEditor to version 4.4.2
Merge branch 'v1.1.0' of github.com:katalyst/koi into v1.1.0
Merge branch 'v1.1.0'
Added a specific version of jquery ui rails
Merge branch 'v1.1.0'
Added a specific version of jquery ui rails
Merge branch 'v1.1.0'
Merge remote-tracking branch 'upstream/master'