merge from git

git-svn-id: https://hedgehog.fhcrc.org/bioconductor/trunk/madman/Rpacks/openCyto@85183 bc3139a8-67e5-0310-9ffc-ced21a209358
add templateGen #67
merge from git templateGen branch
Merge commit '5c9165dbb4ca5469fd20230cb7a402d0f88153ec' into trunk
close #70