move meta to class
Merge branch 'master' into develop
serverproxy fixes