settings changes
Merge branch 'master' of https://github.com/ranveeraggarwal/ldapChat
Merge branch 'master' of https://github.com/ranveeraggarwal/ldapChat

Conflicts:
	netyap/netyap/__init__.pyc
	netyap/netyap/settings.py
	netyap/netyap/settings.pyc
chat html created