修改了location
Merge remote-tracking branch 'origin/pinwall2.5' into pinwall2.5

Conflicts:
	js/src/angularSrc/directives.js