clintbellanger/flare-engine — pull request #545 by stefanbeller (2013-04-01 12:31:01+00:00)
Title: Cutscenes and refactoring in one PR

This combines the pullrequest of @hean01 (#410) and me (#541).
This PR resolves the merge conflicts, no functionality added.