CKeditor hinzugefuegt.
Merge branch 'master' of github.com:thoughtworks/liquid-pub

Conflicts:
	Gemfile.lock
	Merge branch 'master' of github.com:thoughtworks/liquid-pub