tijiao
Revert "tijiao"

This reverts commit b244b48ebdcec11cd89eb37a66c1d780a4006bb0.
Revert "tijiao"

This reverts commit b244b48ebdcec11cd89eb37a66c1d780a4006bb0.
Merge branches 'master' and 'master' of github.com:over-air/Bookmarket

Conflicts:
	ViewModels/ProDetails.cs
	ViewModels/models/Ranklist.cs