Merge branch 'master' of https://github.com/Jacke20/RaidStats

Conflicts:
	src/raid/MainFrame.java
okok
Merge branch 'master' of https://github.com/Jacke20/RaidStats

Conflicts:
	src/raid/MainFrame.java