SettingsAdapter
Merge branch 'Share' of https://github.com/paedu92/MatchMyNetwork.git
into Share

Conflicts:
	MatchMyNetwork_GrundgerÃ¼st/src/SettingsModel.java
	MatchMyNetwork_GrundgerÃ¼st/src/SettingsPanel.java