add popup for object house
clean code
Merge branch 'develop'

Conflicts:
	src/main/java/com/zstrength/builder/service/impl/ProjectServiceImpl.java