WYSIWYG, Template preview, bugfixes
Merged admin branch into this