Updated to use UglifyPHP for Assets
Merge branch 'hotfix/1.1.6'