Reformatting
Merge origin/master

Conflicts:
	Project/PresentationLayer/LoginPanel.java