fixed bug where edit content divs where hidden everywhere
Merge branch 'master' of https://github.com/dkleine/project-m

Conflicts:
	easyticket.php
	inc/styles/easyticket-admin-style.css