Merge branch 'master' of https://github.com/duger/DianDianer

Conflicts:
	DianDianEr/AppDelegate.m