Merge branch 'develop' of github.com:Vocaluxe/Vocaluxe into develop
Merge branch 'develop' of github.com:Vocaluxe/Vocaluxe into develop
Merge branch 'develop' of github.com:Vocaluxe/Vocaluxe into develop
Added DEBUG_HIT option again.
Fix debug hit.
Just a comment-fix
Merge branch 'develop' of github.com:Vocaluxe/Vocaluxe into develop
Reset border adjustments with STRG + ALT + SHIFT + 0
Added screen for screen-adjustments.
Merge branch 'develop' of github.com:Vocaluxe/Vocaluxe into develop

Conflicts:
	Vocaluxe/Base/CGame.cs
Fixed aspect-ration from webcam-texture (video-options)
gstreamer-sharp: code cleanup
Merge branch 'develop' of https://github.com/flokuep/Vocaluxe into develop