Changes favorite page
Merge branch 'master' of github.com:ducdigital/s42m

Conflicts:
	scss/components/components.scss