update index file for production
testen
Merge branch 'develop'

Conflicts:
	app/views/welcome/index.html.erb