Merge branch 'accfix'

Conflicts:
	src/main/java/org/vinsert/gui/controller/AccountController.java
	src/main/java/org/vinsert/gui/view/AccountView.java