Add welcome index
Merge branch 'welcomeindex' into develop