Bug 849417 - Action Icon Spec for Firefox OS page
Merge branch 'bug-849417-action-icons'
Merge remote branch 'mozilla/master'