Renamed Affiliation to Foundation and modified layout
Merge branch 'development' into development_enhancement_2

Conflicts:
	Gemfile
	Gemfile.lock
	app/views/layouts/application.html.haml
	db/seeds.rb