commit.
Merge branch 'lineMoudle' of github.com:webquote/project into lineMoudle

Conflicts:
	resources/js/dataProviderDemo.js
	resources/js/hexinStock/DataProviderTemp/KPainter.js
commit.