TRUNK-2999: Investigate replacing concept word with full text search
TRUNK-2999: Removed ConceptWord. Improved Concept search queries.
TRUNK-2999: Changed to searching by ConceptName not Concept
TRUNK-2999: Simplified LuceneQuery API
Merge branch 'master' of https://github.com/openmrs/openmrs-core into hibernate-search

Conflicts:
	api/src/main/java/org/openmrs/api/context/Context.java
TRUNK-2999: Changed index locking strategy
TRUNK-3832: Add proximity search for Concepts
TRUNK-3832: Lowered boost
TRUNK-3838: Boost phrase search to rank exact matches higher
Merge branch 'master' of https://github.com/openmrs/openmrs-core into hibernate-search
Merge branch 'master' of https://github.com/openmrs/openmrs-core into hibernate-search

Conflicts:
	api/src/main/java/org/openmrs/ConceptNumeric.java
	api/src/main/java/org/openmrs/ConceptSearchResult.java
	api/src/main/java/org/openmrs/ConceptWord.java
	api/src/main/java/org/openmrs/api/ConceptService.java
	api/src/main/java/org/openmrs/api/db/hibernate/HibernateConceptDAO.java
	api/src/main/java/org/openmrs/api/impl/ConceptServiceImpl.java
	api/src/main/java/org/openmrs/scheduler/tasks/ConceptIndexUpdateTask.java
	api/src/main/java/org/openmrs/util/OpenmrsConstants.java
	api/src/main/java/org/openmrs/validator/ConceptValidator.java
	api/src/main/resources/hibernate.cfg.xml
	api/src/test/java/org/openmrs/aop/AuthorizationAdviceTest.java
	api/src/test/java/org/openmrs/api/ConceptServiceTest.java
	api/src/test/java/org/openmrs/api/db/ConceptDAOTest.java
	api/src/test/java/org/openmrs/api/impl/ConceptServiceImplTest.java
	api/src/test/java/org/openmrs/test/BaseContextSensitiveTest.java
	pom.xml
TRUNK-3835 Fix searching for 'of' in concept name
TRUNK-4352 Index is not getting created properly when using standalone
TRUNK 3833: Limit preloading result pages when searching for Concepts
TRUNK-3835 Fixed queries to skip stop words
Merge branch 'TRUNK-3835' into hibernate-search
Merge pull request #885 from rpuzdrowski/TRUNK-3833

TRUNK 3833: Limit preloading result pages when searching for Concepts
TRUNK-3860 Use filter instead of query parameters to eliminate duplicates
TRUNK-2999 Added some javadocs
TRUNK-3835 Fixed concept query after changing default operator to AND