merged agenda and html5 into midori