fix111
Merge branch 'pawelNewS'

Conflicts:
	src/com/group8/view/LoginPanel.java