Bug 796369 - Software button manager
Merge branch 'master' of https://github.com/mozilla-b2g/gaia into bugzilla/796369_master/software-button-manager

Conflicts:
	apps/settings/index.html
Merge pull request #10455 from alivedise/bugzilla/796369_master/software-button-manager

Bug 796369 - Software button manager, r=timdream