test
Merge branch 'master' of github.com:rodstrom/yomibubble into jens

Conflicts:
	Game/codebase/BubbleAdventure.suo
dfglksth
sound lol
Updated Sound system, now has 3D sound.
Fixed WayPoint system and WayPoint Component.
Waypoint system!
Merge with Olof for terrain and character controller.
Commiting new files to my branch.

Signed-off-by: Anders <oakvalley.a@gmail.com>
Removed suo file

Signed-off-by: Farbror Tiny <jens.syntax@gmail.com>
Added waypoint class
Merge branch 'jens' of https://github.com/rodstrom/yomibubble into anders

Conflicts:
	Game/codebase/Components/ComponentsPrereq.h
	Game/codebase/Managers/GameObjectManager.cpp
	Game/codebase/States/PlayState.cpp
	Game/codebase/States/PlayState.h

Signed-off-by: Anders <oakvalley.a@gmail.com>
Merge branch 'jens' of https://github.com/rodstrom/yomibubble into anders
Not rendering terrain

Signed-off-by: Anders <oakvalley.a@gmail.com>
Removed OgreOggSound_d.pdb
Merge branch 'anders' of github.com:rodstrom/yomibubble into jens
added GPUManager.h

Signed-off-by: Anders <oakvalley.a@gmail.com>
Merge branch 'anders' of github.com:rodstrom/yomibubble into jens
Fixed merge issues.

Signed-off-by: Farbror Tiny <jens.syntax@gmail.com>
Merge branch 'jens' of github.com:rodstrom/yomibubble into olof

Conflicts:
	Game/codebase/States/PlayState.cpp
Removed Ogre and boost include as these are include from OGRE_HOME instead.

Signed-off-by: Olof Wallentin <olov.wallentin@gmail.com>