Merge branch 'master' of git://github.com/sinacek/SkautIS

Signed-off-by: sinacek <sinacek@gmail.com>

Conflicts:
	src/SkautIS/Nette/SkautisNette22Extension.php
	src/SkautIS/Nette/Tracy/Panel.php
Merge branch 'master' of git://github.com/sinacek/SkautIS

Signed-off-by: sinacek <sinacek@gmail.com>

Conflicts:
	src/SkautIS/Nette/SkautisNette22Extension.php
	src/SkautIS/Nette/Tracy/Panel.php