Updated data controller
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/hack14/gui/UserFrame.java
Updated data controller