Stealth
Merge branch 'master' of https://github.com/Crosant/Organized

Conflicts:
	classes/calendar.class.php
	inc/header.inc.php