Adding gitignore
Updating spromise
Merge branch 'master' into mark/use-codeinspection

Conflicts:
	linterSettings.js
	pluginLoader.js