lock unlock rename
Merge remote-tracking branch 'origin/master'

Conflicts:
	WebClient/Models/ArbitraryPaymentModel.cs