This merge integrates the collision context, assembler and refactors the TimeIntegrators and Solver modules.