Merge remote-tracking branch 'origin/master'

Conflicts:
	Ndab/Manager.php
	composer.json
composer to nette 2.2