..
Merge branch 'master' of https://github.com/rock117/stock-research

Conflicts:
	src/main/scala/com/rock/stock_research/service/StockService.scala
update