Updated gitignore
Merge branch 'master' of https://github.com/hltcoe/concrete
Merge branch 'master' of https://github.com/hltcoe/concrete

Conflicts:
	.gitignore
Removed Relation set and added in labeled string attribute and edge label attribute
Merge branch 'master' of https://github.com/hltcoe/concrete

Conflicts:
	concrete-protobufs/src/main/proto/concrete.proto
Added two file reading methods to FileUtil
Merge branch 'master' of github.com:JackSullivan/concrete into jack-master
Tweak pom.xml files
Prepare new releases
Prepare pom.xml for next release