stub.

Signed-off-by: martingronlund <martingronlund@live.se>
Merge remote-tracking branch 'remotes/origin/safety' into dev

Conflicts:
	Source/sound/SoundManager.h

Signed-off-by: martingronlund <martingronlund@live.se>
stub.

Signed-off-by: martingronlund <martingronlund@live.se>
Merge remote-tracking branch 'remotes/origin/safety' into dev

Conflicts:
	shiny-bear.suo

Signed-off-by: martingronlund <martingronlund@live.se>
stub.

Signed-off-by: martingronlund <martingronlund@live.se>
stub.

Signed-off-by: martingronlund <martingronlund@live.se>
Moar stub!

Signed-off-by: martingronlund <martingronlund@live.se>
Merge branch 'Sound' into resource

Conflicts:
	TestProject/TestApp.cpp
	shiny-bear.suo
	shiny-bear.vcxproj.filters

Signed-off-by: martingronlund <martingronlund@live.se>
stub.

Signed-off-by: martingronlund <martingronlund@live.se>