update

Signed-off-by: withee <pongsawadarn.me@gmail.com>
Merge branch 'master' of https://github.com/redroad/furniture

Conflicts:
	index.php
update

Signed-off-by: withee <pongsawadarn.me@gmail.com>
update

Signed-off-by: withee <pongsawadarn.me@gmail.com>
Merge branch 'master' of https://github.com/redroad/furniture
update

Signed-off-by: withee <pongsawadarn.me@gmail.com>