Updated Placeholder
Merge remote-tracking branch 'origin/master'

Conflicts:
	RitoConnector/MainWindow.xaml