code up to date
Merge branch 'master' of https://github.com/superruzafa/zero

Conflicts:
	lib/Zero/Dispatcher.php