merge from git

git-svn-id: https://hedgehog.fhcrc.org/bioconductor/trunk/madman/Rpacks/flowWorkspace@85112 bc3139a8-67e5-0310-9ffc-ced21a209358
Merge commit '757b5653849a2bc2eae7e4ed304c9e462445f8a5' into trunk
merge from git

git-svn-id: https://hedgehog.fhcrc.org/bioconductor/trunk/madman/Rpacks/flowWorkspace@85571 bc3139a8-67e5-0310-9ffc-ced21a209358
modify Makevars.win to add libboost_regex
Merge commit '100de85470ee125eabb1a1fdc40b211bd6837dd5' into trunk
modify configure.ac for linking to libboost_regex externally
close #132