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
switched target to java 1.6
Merge branch 'master' of github.com:hltcoe/concrete
Move up protocol buffer version to 2.5.0
Merge branch 'master' of github.com:hltcoe/concrete
Update to SNAPSHOTs for new version
update JUnit version
Merge branch 'master' of github.com:hltcoe/concrete