Added buttons in menustate, commiting to merge code.

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

Conflicts:
	Game/codebase/Components/VisualComponents.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 'olof' of https://github.com/rodstrom/yomibubble into anders

Conflicts:
	Game/codebase/Components/GameObjectPrereq.h
	Game/codebase/States/PlayState.cpp

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

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

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

Signed-off-by: Anders <oakvalley.a@gmail.com>
Added menu, not fully functional yet

Signed-off-by: Herman Rödström <herman@rodstrom.se>