Merge pull request #288 from nem0/stuff2

Stuff2
Merge branch 'master' of github.com:nem0/LumixEngine into stuff2