NetClient Ipdate
Merge remote-tracking branch 'origin/ServerSync' into iOS
Merge remote-tracking branch 'origin/ServerSync' into iOS
Pre-Merge
Merge remote-tracking branch 'origin/ServerSync' into iOS

Conflicts:
	WavePass.Common/WavePass.Common.csproj
Changes before merge
Merge branch 'Server' into iOS
Looks like I added Shim
Merge remote-tracking branch 'origin/ServerSync' into Server
Merge branch 'Server' into iOS
weird shim stuff
Merge branch 'Server' of https://adam8797.visualstudio.com/DefaultCollection/_git/WavePass into Server
Merge branch 'Server' into iOS
Before Migration
userpreff update
Merge remote-tracking branch 'origin/iOS'

Conflicts:
	WavePass.Common/INetClient.cs