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

Conflicts:
	dataProviderDemo.html
	resources/js/dataProviderDemo.js
	resources/js/hexinStock/DataProviderTemp/BaseDataProvider.js
	resources/js/hexinStock/DataProviderTemp/KLineProvider.js