Updated the ldap security to work with properties files.
Adding the ldap files that were missing.
Fixing a conflict, can't get merge --abort to work.
Adding log4j so that datanucleus will enhance correctly and give me the log.
Fixed a bunch of conflicts.
Pushing large update with ldap and questions api.
Updates to the ask question
Adding the classpath and factorypath to filesystem
Merge branch 'development'

Conflicts:
	.classpath
	.factorypath