Renaming the variables in Window class
Merge branch 'master' of https://github.com/Eipifi/Ariadne

Conflicts:
	src/ariadne/Application.java
	src/ariadne/ui/graphic/Window.java