Working some changes
Merge branch 'master' of https://github.com/rustadmd/SWCCG-Manager

Conflicts:
	src/swccgManager/Settings.java