Making sure Activity etc. is in there
Merge branch 'master' into addingActivityEtc

Conflicts:
	src/DatabasePipeline.java
	src/DatabasePipelineTestToyWorld2.java