Updated dashboard settings
Updated dashboard settings
Merge branch 'master' of git.red-sky.pl:deszynski/filestube-dashboard

Conflicts:
	FilestubeDashboard/src/main/assets/www/js/components/settings.dist.js