Merge branch 'master' of github.com:emark/storeadmin into dev
Merge branch 'dev' of github.com:emark/storeadmin into dev
Merge branch 'dev' of github.com:emark/storeadmin into dev
edit YML schema