Merge branch 'master' of https://github.com/xinjiguaike/DangDang

Conflicts:
	DangDangAutoPal/Models/AutoPal.cs
Merge branch 'master' of https://github.com/xinjiguaike/DangDang

Conflicts:
	DangDangAutoPal/Models/AutoPal.cs