Chnage a bit here and there
Merge branch 'master' of https://github.com/Davik93/Onlinetexteditor

Conflicts:
	Buttons.php
	website.php