Merge changeset_cache_refactor into snapshot_nodes

Conflicts:
	src/main.cpp