Update
Merge branch 'Altalus-PrivateServer' of https://github.com/Altalus/darkstar into Altalus-PrivateServer

Conflicts:
	conf/map_darkstar.conf

Local
Merge branch 'Altalus-PrivateServer' of https://github.com/Altalus/darkstar into Altalus-PrivateServer

Update
Merge branch 'Altalus-PrivateServer' of https://github.com/Altalus/darkstar into Altalus-PrivateServer
Merge branch 'Altalus-PrivateServer' of https://github.com/Altalus/darkstar into Altalus-PrivateServer
Merge branch 'Altalus-PrivateServer' of https://github.com/Altalus/darkstar into Altalus-PrivateServer
Merge branch 'Altalus-PrivateServer' of https://github.com/Altalus/darkstar into Altalus-PrivateServer
Merge branch 'Altalus-PrivateServer' of https://github.com/Altalus/darkstar into Altalus-PrivateServer
Merge branch 'Altalus-PrivateServer' of https://github.com/Altalus/darkstar into Altalus-PrivateServer
Merge branch 'Altalus-PrivateServer' of https://github.com/Altalus/darkstar into Altalus-PrivateServer
Merge branch 'Altalus-PrivateServer' of https://github.com/Altalus/darkstar into Altalus-PrivateServer
Merge branch 'Altalus-PrivateServer' of https://github.com/Altalus/darkstar into Altalus-PrivateServer