Upgrade minifier
Upgrade minifier
Merge branch 'master' of github.com:matthiasmullie/forkcms into matthiasmullie-master

Conflicts:
	composer.lock
Merge branch 'matthiasmullie-master'

Conflicts:
	composer.lock
Merge branch 'master' of github.com:forkcms/forkcms