Sync with SebSauvage repo
Merge branch 'master' into myShaarli

Conflicts:
	tpl/page.header.html
	tpl/picwall.html
	tpl/tagcloud.html