Merge branch 'master' of github.com:stormcloud-ide/api

Conflicts:
	.gitignore