Update theme with SASS from static template
Switch WYSIWYG editor to CKEditor
Add Devel module
Fix merge conflicts