re-work file set dialog, closes #319
Merge branch 'master' of github.com:concrete5/concrete5-5.7.0

Conflicts:
	web/concrete/composer.lock