add local properties
Merge branch 'master' of https://github.com/chiuyinche/SnailHouses

Conflicts:
	src/main/resources/global.properties
	src/main/resources/spring/applicationContext.xml