Merge remote-tracking branch 'mozilla/master'

Conflicts:
	pages/desktop/consumer_pages/base.py
Merge remote-tracking branch 'mozilla/master'
Merge remote-tracking branch 'mozilla/master'
Merge remote-tracking branch 'mozilla/master'
Merge remote-tracking branch 'mozilla/master'
Made some extra nits
Updated acording reviews
Merge pull request #211 from AndreiH/extra-nits

Extra nits