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

Conflicts:
	dataProviderDemo.html
	resources/js/dataProviderDemo.js