Merge remote-tracking branch 'origin/master'

Conflicts:
	Code/Stream2Me_Message/dist/Stream2Me_Message.jar
	Code/Stream2Me_Server/stream2Me.db