Filled ComboBoxes and DataTable with dummy data
Forgot some classes
Merge branch 'master' of https://github.com/sofengII/AwarenessSystem.git

Conflicts:
	AwarenessSystem/src/main/java/beans/User.java