Fixed for Nette 2.2
Revert "Added shortcuts for callbacks and debugger"

This reverts commit 2befbc496a0b4fa562a2a6cae308fe10b2955a6a.
updated composer.json branch alias
Merge branch 'master' of https://github.com/nette/sandbox

Conflicts:
	app/bootstrap.php
	app/templates/Homepage/default.latte
	composer.json
	www/css/screen.css