update
Merge branch 'master' of https://github.com/redroad/furniture

Conflicts:
	index.php