Merge remote-tracking branch 'origin/master' into devel
stratelit changes & bugfixes
Merge remote-tracking branch 'origin/devel' into devel

Conflicts:
	changelog.txt
	httpsdocs/classes/CB/Files.php
	httpsdocs/classes/CB/TreeNode/MyCalendar.php
	httpsdocs/classes/CB/TreeNode/RecycleBin.php
	httpsdocs/classes/CB/TreeNode/Tasks.php
Merge branch 'devel'