fixed merge bugs.

Signed-off-by: Olof Wallentin <olov.wallentin@gmail.com>
removed lib files from git branch

Signed-off-by: Olof Wallentin <olov.wallentin@gmail.com>
Merge branch 'olof' of github.com:rodstrom/yomibubble into jens

Conflicts:
	Game/codebase/States/IntroMovieState.cpp