Merge remote-tracking branch 'upstream/master'

Conflicts:
	Code/Cronicles.dm
	Code/DJ.dm
	Code/Daily Prophet.dm
	Code/Login.dm
	Code/PM.dm
	Code/RemovedVerbs.dm
	Code/enemies.dm
	world.dmp