Merge branch 'master' of https://github.com/DeaneLooi/JDay2.git

Conflicts:
	IT1537-Project/src/jday/ui/user/MainFrame.java
Merge branch 'master' of https://github.com/DeaneLooi/JDay2.git