Properties

Properties
Merge branch 'master' of https://github.com/melkawakibi/BPSproject

Conflicts:
	BagageProccessingSystem/nbproject/private/private.properties
fixen bunyamin zijn github