Merge branch 'master' of github.com:sparkbox/apprentice-application into sign-up

Merged changes from master, but need to delete index file and move code over from index into show, which I am calling from GET request under rake routes.

Conflicts:
	app/views/demographics/_demographic_step.html.erb
	app/views/demographics/index.html.erb
	app/views/layouts/application.html.erb
	app/views/personality/_personality.html.erb
	app/views/personality/index.html.erb
	app/views/welcome/_apprenticeship_information
Added footer partial in reason view so page renders with necessary partials.
Merge branch 'personality' of github.com:sparkbox/apprentice-application into sign-up

Deleted redundant index files.

Conflicts:
	app/views/demographics/index.html.erb
	app/views/layouts/application.html.erb
	app/views/personality/_personality.html.erb
	app/views/personality/index.html.erb
	app/views/welcome/_apprenticeship_information