Merge branch 'master' of https://github.com/iele/FanfouWP

Conflicts:
	FanfouWP/Properties/AssemblyInfo.cs