Added tinymce
Added text component
Merge branch 'master' of https://github.com/fxaeberhard/Wallogram

Conflicts:
	public/js/screen.js