fix bug
lang ckeditor
merge conflic
merge conflict
Merge remote-tracking branch 'origin/develop' into develop

Conflicts:
	docs/Sprint 7 - 1905 To 0106/20140531.txt
	docs/Sprint 8 - 0206 To 1306/Target.txt
	src/docroot/js/main.js
	src/docroot/style/main.css