nicer pages
Merge branch 'master' of github.com:lyoshenka/note

Conflicts:
	views/bookmarklet.twig.html