Merge branch 'master' of https://github.com/DarkstarProject/darkstar into guild_points

Conflicts:
	win32/DSGame-server/DSGame-server.vcxproj.filters
Merge branch 'guild_points' of http://github.com/xdemolish/darkstar into guild_points

Conflicts:
	win32/DSGame-server/DSGame-server.vcxproj.filters