Merge branch 'master' into nag_4_2
Sort
[jan] Add recurrence controls to basic view (Request #11545).
Reorder
Fix rounding when dragging events (Bug #11904).
[jan] Fix padding of drop down lists with scrollbars (Bug #11971).
Merge branch 'nag_4_2'

Conflicts:
	framework/Core/js/keynavlist.js
	framework/Core/package.xml
	kronolith/templates/dynamic/task.inc
	nag/docs/CHANGES
	nag/lib/Ui/VarRenderer/Nag.php
	nag/package.xml