again...have a bug...
Merge remote-tracking branch 'maemual/master'
bug = =!

Conflicts:
	Tools/Fish.MovieManager.UI/MainWindow.xaml.cs
Merge remote-tracking branch 'maemual/master'
my work is over again.
Merge pull request #2 from withwind93/master

my work is over again.