update design
Merge remote-tracking branch 'origin/master'

Conflicts:
	class/settings.ini.php
aa
Merge remote-tracking branch 'origin/master'