Merge pull request #139 from shaunarundell/master

#27, #100 - Create disk launcher app - minor cleanup
Merge pull request #140 from shaunarundell/master

Add Stop Command to command map
update components
Merge remote-tracking branch 'upstream/master'

Conflicts:
	MediaBrowser.Theater.Implementations/Presentation/ScreensaverManager.cs