Merge remote-tracking branch 'origin' into nlp_trunk

git-svn-id: https://nlp-app.ucsd.edu/repos/knowledge_author/schema_builder/trunk@58 5e49d7dc-7aae-4a34-a364-519bf8368b13
Merge branch 'master' into nlp_trunk

git-svn-id: https://nlp-app.ucsd.edu/repos/knowledge_author/schema_builder/trunk@59 5e49d7dc-7aae-4a34-a364-519bf8368b13
svn2git test 1

git-svn-id: https://nlp-app.ucsd.edu/repos/knowledge_author/schema_builder/trunk@60 5e49d7dc-7aae-4a34-a364-519bf8368b13
remove svn2git_test1

git-svn-id: https://nlp-app.ucsd.edu/repos/knowledge_author/schema_builder/trunk@61 5e49d7dc-7aae-4a34-a364-519bf8368b13
add config tpl

git-svn-id: https://nlp-app.ucsd.edu/repos/knowledge_author/schema_builder/trunk@66 5e49d7dc-7aae-4a34-a364-519bf8368b13
add user and password for mysql

git-svn-id: https://nlp-app.ucsd.edu/repos/knowledge_author/schema_builder/trunk@67 5e49d7dc-7aae-4a34-a364-519bf8368b13
modify config tpl

git-svn-id: https://nlp-app.ucsd.edu/repos/knowledge_author/schema_builder/trunk@68 5e49d7dc-7aae-4a34-a364-519bf8368b13
cache UMLS/schema mapping; select categories; TODO: attributes page

git-svn-id: https://nlp-app.ucsd.edu/repos/knowledge_author/schema_builder/trunk@81 5e49d7dc-7aae-4a34-a364-519bf8368b13
Merge branch 'master' into nlp_trunk

Conflicts:
	SchemaBuilder/grails-app/services/edu/ucsd/idash/MetaSchemaService.groovy

git-svn-id: https://nlp-app.ucsd.edu/repos/knowledge_author/schema_builder/trunk@86 5e49d7dc-7aae-4a34-a364-519bf8368b13