Merge origin/master

Conflicts:
	Project/GUI/CreateAccountPanel.java
	Project/GUI/Settings.form
	Project/GUI/Settings.java