Ingnore idea workspace.xml
Merge branch 'master' of https://github.com/swcho/ossdb2

Conflicts:
	.gitignore
Typescript build error fix