Add some fuction
Merge remote-tracking branch 'maemual/master'
hehe

Conflicts:
	Fish.MovieManager.Test/Program.cs