Adding IDE files to gitignore
Merge remote-tracking branch 'origin/master'

* origin/master:
  Miscellaneous updates
  Initial commit of workbench boilerplate

Conflicts:
	.gitignore