封装了一些获取数据的接口
Merge remote-tracking branch 'origin/pinwall2.5' into pinwall2.5

Conflicts:
	index.html
	js/src/angularSrc/directives.js