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

Conflicts:
	IMPRO/src/dal/ConfigurationGUI.java