update
Merge branch 'master' into richard

Conflicts:
	nette-blog/app/presenters/BasePresenter.php
update HTML (add form), diary can show a quarter of hour
fix TD height