Merge branch 'master' of https://github.com/dekmabot/Asterix-CMS

Conflicts:
	core_2.14/classes/nestedsets.php