Merge branch 'develop' of https://github.com/Member1221/Terasology into develop

Conflicts:
	engine/src/main/java/org/terasology/rendering/nui/layers/mainMenu/videoSettings/VideoSettingsScreen.java