Merge branch 'master' into dev
minifcation bug
Merge branch 'dev'