Update Add News + Locale
Merge branch 'master' of https://github.com/snowinrain/MyRepo.git

Conflicts:
	RealEstate/.gradle/1.10/taskArtifacts/cache.properties.lock
	RealEstate/.gradle/1.10/taskArtifacts/fileHashes.bin
	RealEstate/.gradle/1.10/taskArtifacts/fileSnapshots.bin
	RealEstate/.gradle/1.10/taskArtifacts/outputFileStates.bin
	RealEstate/.gradle/1.10/taskArtifacts/taskArtifacts.bin
	RealEstate/.settings/org.eclipse.jdt.core.prefs
	RealEstate/src/main/java/com/realestate/common/LocaleBean.java
	RealEstate/src/main/java/com/realestate/news/NewsBean.java
	RealEstate/src/main/webapp/pages/news/common/header.xhtml