Mark featured projects from project#index
Merge branch 'master' of https://github.com/thisismetis/up_minds

Conflicts:
	Gemfile
	Gemfile.lock
	app/views/users/show.html.erb
	config/routes.rb