gitignore
Merge branch 'master' of https://github.com/learning-layers/SocialSemanticServer

Conflicts:
	.gitignore
	ss-adapter/ss-adapter-rest/src/main/webapp/swagger/generated/document.html
	ss-adapter/ss-adapter-rest/src/main/webapp/swagger/swagger-ui/SSAdapterRest.json
	ss-adapter/ss-adapter-rest/src/main/webapp/swagger/swagger-ui/service.json