Buidl dir for debug set
Merge branch 'master' into production
Build dir for production set