adding changes for version 1.2
Merge branch 'master' of github.com:innoq/LiQID

Conflicts:
	ldap-connector/src/com/innoq/ldap/connector/LdapHelper.java