new branch
Merge remote-tracking branch 'origin/dev' into dev

Conflicts:
	lib/MiscSorter.php
Change in class name