Merge remote-tracking branch 'origin/master'

Conflicts:
	home.html
	js/home.js