Don't forget this
Update security for postgresql database support
Merge remote-tracking branch 'origin/master'

Conflicts:
	.classpath
	src/main/java/com/elgregos/security/data/crud/UserCrudService.java
	src/main/java/com/elgregos/security/data/entities/User.java
	src/main/java/com/elgregos/security/service/LoginVerifier.java
	src/main/resources/META-INF/persistence.xml
	src/test/java/com/elgregos/security/authentication/PersonalLoginModuleTest.java
	src/test/java/com/elgregos/security/service/PasswordEncryptionServiceTest.java
	src/test/java/com/elgregos/security/service/UserCrudServiceTest.java
	src/test/resources/import.sql