Merge branch 'master' of https://github.com/Radirius/Rflex

Conflicts:
	Project/src/radirius/rset/game/Game.java
	Project/src/radirius/rset/game/Main.java
	Project/src/radirius/rset/screen/PauseScreen.java
	Project/src/radirius/rset/screen/PlayScreen.java
	Project/src/radirius/rset/screen/QuitScreen.java
	Project/src/radirius/rset/screen/Screen.java
	Project/src/radirius/rset/screen/TitleScreen.java
Merge branch 'master' of https://github.com/Radirius/Rflex