Added stage2
Added Friendship Scaffold
Merge branch 'stage2'

Conflicts:
	.c9revisions/config/routes.rb.c9save
	config/routes.rb