Update to latest EM head
Merge branch 'master' of github.com:Pixate/pixate-freestyle-ios