testing branches

Signed-off-by: Anders Ekdahl <oakvalley.a@gmail.com>
Merge branch 'anders' of https://github.com/rodstrom/tikububble
GUI

Signed-off-by: olowal <olov.wallentin@gmail.com>
Cleaning

Signed-off-by: olowal <olov.wallentin@gmail.com>
Fixed overlay GUI, added the ability to add the textures. Win.

Signed-off-by: anders <oakvalley.a@gmail.com>
GuiManager

Signed-off-by: Anders <oakvalley.a@gmail.com>
Deleted vcxproj from the merge.

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

Conflicts:
	Game/codebase/BubbleAdventure.v11.suo
	Game/codebase/Components/PlayerController.cpp
	Game/codebase/Managers/InputManager.h
	Game/codebase/Nostromo.vcxproj
	Game/codebase/Nostromo.vcxproj.filters
	Game/codebase/States/PlayState.cpp
	Game/codebase/States/PlayState.h
	Game/run/bin/debug/Ogre.log
GUI component, collision on overlays.

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

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

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

Signed-off-by: Anders <oakvalley.a@gmail.com>
Merge branch 'master' of github.com:rodstrom/yomibubble into olof
Slight changes to player input and removed mouse pointer.

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