Merge branch 'master' of https://github.com/0ad/0ad
pe tjis wotrks

Conflicts:
	source/soundmanager/SoundManager.cpp
	source/soundmanager/SoundManager.h
	source/soundmanager/items/CSoundBase.cpp
Merge branch 'master' of https://github.com/stwf/0ad