dd
Merge branch 'master' of https://github.com/WinHuStudio/iTrip

Conflicts:
	src/trunk/iTrip.v11.suo
修改引用