Bug 821673 - Redesign back, menu and close buttons
Merge branch '821673' of https://github.com/rnowm/gaia into 821673

Conflicts:
	shared/style/headers.css