Route reflection in NavBar
Merge branch 'master' of github.com:robbywashere/btc-streaming-data into robbywashere-master

Conflicts:
	public/src/js/app.js
	public/src/js/views/page.js
	public/src/jsx/views/page.jsx