-
Merge remote-tracking branch 'origin/master'

Conflicts:
	UG/TextBox.cpp
Merge branch 'master' of https://github.com/InDieTasten/--UntitledGame--