edit features
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/php/service/FurnitureService.class.php