testing merge
Merge remote-tracking branch 'origin/master'

Conflicts:
	IslandFurniture-ejb/nbproject/private/private.properties
	IslandFurniture-war/nbproject/private/private.properties
	IslandFurniture-war/nbproject/private/private.xml
	IslandFurniture-war/web/index.html
	nbproject/private/private.properties
Merge branch 'master' of https://github.com/yanruoxi/IslandFurniture

Conflicts:
	IslandFurniture-ejb/nbproject/private/private.properties
	IslandFurniture-war/nbproject/private/private.properties
	IslandFurniture-war/web/index.html
	nbproject/private/private.properties
Merge branch 'master' of https://github.com/yanruoxi/IslandFurniture

Conflicts:
	IslandFurniture-war/web/index.html