Merge branch 'master' into weblog

Conflicts:
	template/default/style/main_makefly.css
Merge branch 'weblog' of olivier.dossmann.net:blogbox/makefly into weblog