afff
Merge remote-tracking branch 'origin/master'

Conflicts:
	bin/GUI/GUILogic$AddEventGUIActionListener.class
	bin/GUI/GUILogic$AddUserActionListener.class
	bin/GUI/GUILogic$EventListActionListener.class
	bin/GUI/GUILogic$MainMenuActionListener.class
	bin/GUI/GUILogic$NoteListActionListener.class
	bin/GUI/GUILogic$UserInfoActionListener.class