Merge
Merge branch 'master' of https://github.com/andallas/Wopen

Conflicts:
	Wopen-csharp.sln
	Wopen.sln