More work on rooms
adding .gitignore for merge
Merge branch 'master' of github.com:Aslai/Coldstormd

Conflicts:
	ColdstormDaemon.depend
	ColdstormDaemon.layout