garbage

local commit
Merge branch 'master' of https://github.com/onsharp/Cnet.IOS

Conflicts:
	src/Cnet.iOS/Controllers/OSAssignmentViewController.cs