admin updates
Merge branch 'master' of github.com:veljamatic/happymeal