Merge branch 'master' of https://github.com/JoepS/GeneralStore

Conflicts:
	Java Project/GeneralStore/build/classes/generalstore/GeneralStore.class