Merge remote-tracking branch 'upstream/master'

Conflicts:
	dist/js/common-header.js
	src/js/controllers/ctr-registration-modal.js
	src/templates.js
	src/templates/auth-buttons-menu.html
	src/templates/auth-buttons.html