modified:   css/style.css
	new file:   html/dialog-workspace-settings.html
	modified:   main.js
	modified:   package.json
Merge branch 'master' of https://github.com/vevedh/bracket-veve-ionic