temp
Merge branch 'develop' of https://github.com/webquote/project into develop
line
temp
line version1
Fix bug.
Replace with d3.min.js
Fix.
temp
Merge branch 'lineMoudle' of https://github.com/webquote/project into lineMoudle
temp
temp
Rewrite scale.ticks.
Add 0.5
Merge branch 'lineMoudle' of github.com:webquote/project into lineMoudle

Conflicts:
	resources/js/hexinStock/scale.js
Commit.
Commit.
Add extent.
Merge branch 'lineMoudle'

Conflicts:
	resources/js/hexinStock/scale.js
Merge branch 'master' of github.com:webquote/project