Premerge
Fixing conflicts
Deleting annoying CKE files and moving functionality to gem