Added basic implementation of emulator / fixed mocked scene
Merge remote-tracking branch 'origin/master'