Merge branch '0.8.x' into userdesign

Conflicts:
	actions/designsettings.php

diff --cc actions/designsettings.php
Simple merge

diff --cc classes/User.php
Simple merge

diff --cc db/laconica.sql
Simple merge

diff --cc lib/attachmentlist.php
Simple merge

diff --cc lib/noticelist.php
Simple merge