test
Merge branch 'staging' of github.com:itdoors/sd into staging

Conflicts:
	src/SD/CalendarBundle/Form/TaskForm.php