Moved source files to subfolder, added options to ldap authentication, little fix in options.xml
Merge remote-tracking branch 'origin/master'

Conflicts:
	source/options.xml