Signed-off-by: Hendrik Jonas Meyer <h.meyer@bigpoint.net>
Merge branch 'master' of git@github.com:DumbledoresArmy/NAC.git

Conflicts:
	src/de/g18/it3l/NACGUI.java