shuwei
Merge remote-tracking branch 'origin/master'

Conflicts:
	IslandFurniture-war/nbproject/private/private.xml