ldap config
uwsgi config file
Merge branch 'devel' of https://github.com/NoDesk/NoDesk-Server into devel
ldap ldif starter config file
LDAP settings, uWSGI settings & fix some bug
Add/modify ldif default file for nodesk
add .ini file for uwsgi
fix some bug in nodesk_template
add test nodesk template
add uwsgi ini using an tcp socket instead of UNIX socket
so uwsgi can be used without nging / http proxy
ldap config are now read in a yaml file
change uwsgi config
Fix some bugs in the models management
change script according to previous commit
add django app to allow the administration/config of NoDesk
Merge branch 'devel'

Conflicts:
	requirements.txt