merged svn.
Added GapJunction.cpp to CMake.