Closes #18. Also added some fixes in CKEditor display and validation for users
Merge origin/master