Mergin master
Changed flows
Committed changes to README template
Finished moving towards 2.5.1
Added back the connection points