fix:fixing merge issues with sign-up and master
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