Departement and Pathway update

Added methods and variables to the departement class and the pathway
class
Updates to things
Merge remote-tracking branch 'origin/master'

Conflicts:
	Java Project/GeneralStore/src/generalstore/GeneralStore.java