Coming Soon page
Merge remote-tracking branch 'github/master' into prod

Conflicts:
	index.html
Merge remote-tracking branch 'github/master' into prod
Merge remote-tracking branch 'github/prod'