tweak for new_nav_bar
update README
tweak new nav for greasemoneky
Merge remote-tracking branch 'upstream/master'

Conflicts:
	manifest.json