Codes minifed
Codes minifed
Merge branch 'master' into development