merge
Merge branch 'it4' of https://github.com/FMiscia/Coedil99 into it4

Conflicts:
	src/GUI/Login/Login.java