modify dev
Merge branch 'master' of https://github.com/dehuinet/minxing-server-flavors