Add welcome controller and index view
Merge remote-tracking branch 'upstream/master' into welcome-controller