modified events
Merge branch 'master' of https://github.com/hcjvyn/ASDProject.git

Conflicts:
	src/framework/ui/AddAccDialog.java