Merge remote-tracking branch 'origin/master'

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