Merge remote-tracking branch 'origin/master'

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