Modify to dev mode
Merge branch 'master' into dev_mode
ADD USER mode
change to deploy mode