Included function from bundle script
Add hpp and cpp files to doxygen input patterns.
Update doxygen comments for C++.
Update doxygen comments for C++.
Update doxygen file C++.
Merge pull request #118 from pdebuyl/update_doxy

Update doxygen comments and pattern
Fixed small bug from renaming.
make new pore constraint backwards compatible
fixed merge conflict
Merge pull request #119 from ohickey/fixed_pull_request

Lattice-Boltzmann 3-point coupling and user choosable noise type.
Update NEWS
Update NEWS
writevtf now creates one atom record per atom type/charge combination, thus avoiding several recors for the same atome type.
Merge branch '3.2'

Conflicts:
	scripts/vtf.tcl
fixed problems with compatibility with Shan Chen and old CUDA (no printf or errexit)
Merge pull request #120 from ohickey/fixed_pull_request

fixed problems with compatibility with Shan Chen and old CUDA (no printf...
Pimped starwars demo script.
Merge branch '3.2'

Conflicts:
	scripts/auxiliary.tcl
Merge branch 'master' of github.com:espressomd/espresso
Fixed minor merge conflict concerning the placement of brackets and indentation.