Merge origin/master

Conflicts:
	FitBox/src/fitbox/view/ScreensFramework.java
Merge origin/master

Conflicts:
	FitBox/nbproject/private/private.properties