temp
Merge branch 'master' of https://github.com/HieuHacker/SEM2

Conflicts:
	IMPRO Minh/build/built-jar.properties
	IMPRO Minh/nbproject/private/private.properties