Mario,Vivek,Vinay,D3| Reloading proxy objects from concepts dao to be able to get full representation of concept tree, including Concept Numeric and Concept Complex
identing the test
Mario | Fixing bug about show a stackoverflow when there were circular references. Now it is showing a proper message and telling what is the concept that should be fixed
Mujir | #1077 | adding dependency on commons-httpclient for openerpclient. This may go away later
Revert "Vinay | #845 | Add ability to search by cityVillage"

This reverts commit c6d4344dffc6f18d3b68c13b3f0a64f48bae0fdd.

Conflicts:
	api/src/main/java/org/openmrs/PatientSearchParameters.java
	api/src/main/java/org/openmrs/api/db/hibernate/HibernatePatientDAO.java
	api/src/main/java/org/openmrs/api/db/hibernate/PatientSearchCriteria.java
	api/src/main/java/org/openmrs/api/impl/PatientServiceImpl.java
The map containing the hash of loaded concepts should be in request scope and not application scope. DAO's are singletons.
Vivek | Fixed the recursive logic when loading concept sets.
Added a new test for the scenario when the exception should be raised
Concept need not be lazy always
Mujir | #498 | added dependency on mail-appender. Added bahmni-artifactory repository.