Merge pull request #2079 from AndrewPodner/develop

Issue #2078: refinement of the minify function for CSS and scripts.