Merge branch 'master' of github.com:josefsabl/nette-base

Conflicts:
	app/templates/layouts/@layout-basic.latte
	app/templates/layouts/@layout-panel-3column.latte
	app/templates/layouts/@layout-table-3column.latte
	composer.lock
	readme.md