Merge branch 'master' of https://github.com/intersystems-ru/glossary
oAuth
Merge branch 'master' of bitbucket.org:eduard93/isc_glossary

Conflicts:
	REST/Broker.cls.xml
	REST/JSON.cls.xml
	Word/Comment.cls.xml
	csp/Bootstrap/css/bootstrap.css.xml
	csp/Bootstrap/css/bootstrap.min.css.xml
	csp/Bootstrap/css/glossary.css.xml
	csp/Bootstrap/img/intersystems-header.gif.xml
	csp/Bootstrap/js/glossary.js.xml
	csp/Bootstrap/js/glossary_admin.js.xml
	csp/about.csp.xml
	csp/admin.csp.xml
	csp/rest1.csp.xml
	csp/term.csp.xml
	sc-list.txt
Merge branch 'master' of https://github.com/intersystems-ru/glossary
oAuth
rm