navigation style
Merge branch 'master' of https://github.com/ripple/ripplecharts-frontend

Conflicts:
	src/app/app.js
	src/common/multimarket.js