add coe thing
add javadoc plugin
Merge branch 'master' of github.com:hltcoe/concrete
Merge branch 'master' of github.com:hltcoe/concrete
indent fix
kill extra plugin def
Merge branch 'master' of github.com:hltcoe/concrete
Merge branch 'master' of github.com:hltcoe/concrete
Merge branch 'master' of github.com:hltcoe/concrete
Add protoc tool to protobufs pom file
Merge branch 'master' of github.com:hltcoe/concrete

Conflicts:
	pom.xml
kill protoc dep
Merge branch 'master' of github.com:hltcoe/concrete
Merge branch 'master' of github.com:hltcoe/concrete
update JUnit version
Merge branch 'master' of github.com:hltcoe/concrete
add header to runner script
Merge branch 'master' of github.com:hltcoe/concrete
Merge branch 'master' of github.com:hltcoe/concrete
Merge in tiny conflict