Finished Social Integration
Merge branch 'master' of https://github.com/Ideyatech/opentides3.git

Conflicts:
	opentides3-core/src/main/java/org/opentides/dao/UserGroupDao.java
	opentides3-core/src/main/java/org/opentides/util/UrlUtil.java
	opentides3-core/src/main/java/org/opentides/web/controller/BaseCrudController.java
	opentides3-core/src/main/resources/META-INF/resources/WEB-INF/jsp/base/user-crud.jsp
	opentides3-core/src/main/resources/META-INF/resources/WEB-INF/jsp/login.jsp
	opentides3-core/src/main/resources/base/jpql/core.properties
	opentides3-core/src/test/java/org/opentides/bean/converter/StringToBaseEntityConverterTest.java
	opentides3-sample/src/main/resources/app/spring/applicationContext-security.xml