TRUNK-3960 - web.xml changes to allow reload log4j.xml configuration without server restart

Conflicts:
	webapp/src/main/webapp/WEB-INF/web.xml
TRUNK-3960 - Fix for the order of registering the listeners.

Conflicts:
	webapp/src/main/webapp/WEB-INF/web.xml
Vinay | #845 | Add ability to search by cityVillage