Merge branch 'master' into dev-5-1

Conflicts:
	PlayWall/src/de/tobias/playpad/PlayPadMain.java
	PlayWall/src/de/tobias/playpad/action/cartaction/PadPositionWarningListener.java
	PlayWall/src/de/tobias/playpad/action/cartaction/PadStatusFeedbackListener.java
	PlayWall/src/de/tobias/playpad/layout/modern/ModernLayoutCart.java
	PlayWall/src/de/tobias/playpad/layout/modern/ModernLayoutGlobal.java
	PlayWall/src/de/tobias/playpad/pad/listener/PadPositionListener.java
	PlayWall/src/de/tobias/playpad/viewcontroller/main/MainViewController.java
	PlayWall/src/de/tobias/playpad/viewcontroller/option/pad/PadSettingsViewController.java
	PlayWallCore/src/de/tobias/playpad/PlayPad.java
	PlayWallCore/src/de/tobias/playpad/Updatable.java
	PlayWallCore/src/de/tobias/playpad/pad/Pad.java
	PlayWallCore/src/de/tobias/playpad/project/Project.java