new pages of strategies and stock
Merge branch 'master' of https://github.com/shou1dwe/baba-king-trading

Conflicts:
	app/controllers/Application.java
	conf/routes