fresh fix/failing-test request
Merge branch 'upstream-develop' into fix/failing-test

Conflicts:
	app/styles/main.css
updated stock graph style
Merge branch 'upstream-develop' into fix/stock-graph-style

Conflicts:
	app/views/dashboard/dashboard.html
Merge pull request #291 from jofomah/fix/stock-graph-style

Fix/stock graph style