Merge branch 'master' into brian

diff --cc action.cc
Simple merge

diff --cc action.h
Simple merge

diff --cc clockvector.cc
Simple merge

diff --cc main.cc
Simple merge

diff --cc model.cc
Simple merge