fixed little numerical instability in dielectric pore and added

external field to iccp3m again
Merge branch 'master' of git://github.com/espressomd/espresso
added out radius for pore constraint an lbboundary

Conflicts:

	src/tcl/lb-boundaries_tcl.c
Merge branch 'master' into work_branch
Merge remote-tracking branch 'stefan/master' into work_branch
Merge branch 'master' into work_branch
to ensure that the work_branch is up to date
No actual change.
Merge branch 'master' into updated_branch

Merged with C++ branch.
Added velocity to cylinder boundary in at the TCL level. Velocity boundary command should be added and verified for the other boundaries as well at the TCL level. Presumably the code to implement them already functions.
Merge remote-tracking branch 'ohickey/workingBranch' into updated_branch

Merged to get three-point coupling, and remove some compiler warnings.
Removed several compilor warnings.
Cleaned up more warnings, put cuda_safe_mem statements into the code, and removed the cuda_is_cpp.cpp file + all instances from the makefile
Corrected minor typos