Initial Flexible Search Commit

Initial Flexible Search Commit
Merge branch 'master' of https://github.com/Ideyatech/opentides3

Conflicts:
	opentides3-core/src/main/java/org/opentides/security/SocialMediaAuthenticationProvider.java
	opentides3-core/src/main/java/org/opentides/social/service/SocialProviderService.java
	opentides3-core/src/main/java/org/opentides/social/service/impl/FacebookServiceProviderImpl.java
	opentides3-core/src/main/java/org/opentides/social/service/impl/GoogleServiceProviderImpl.java
	opentides3-core/src/main/java/org/opentides/social/service/impl/SocialProviderServiceImpl.java
	opentides3-core/src/main/java/org/opentides/social/service/impl/TwitterServiceProviderImpl.java
	opentides3-core/src/main/resources/base/spring/applicationContext-app.xml
	opentides3-core/src/main/resources/base/spring/applicationContext-web.xml
	opentides3-core/src/main/resources/localhost.properties
	opentides3-social/src/main/java/org/opentides/social/enums/SocialMediaType.java
	opentides3-social/src/main/java/org/opentides/social/security/SocialAuthenticationToken.java
Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/master'
- updated main DAO for flexible search module
- updated operators used for building criteria API