Challenge welcome page part 1
Merge remote-tracking branch 'origin/master'

Conflicts:
	static/js/maps.js