begins adding step choice to worksheet entry
WIP tokens change color
friendship index and search
approval of friendships
you can reject friendships too
you can now remove friends
translate accept and reject
can view a friends profile
authorize user show page
you can view your own profile
JS mostly in place to switch between worksheet steps
set default hidden values on page load
update show user routes to username
fix mergies
correct token colors, cleanup navbar text
navbar styles
finishes and refactors adding a worksheet entry
Merge branch 'staging' into worksheet_entries

Conflicts:
	db/schema.rb
create basic feed view and scoping
allows the showing and hiding of a step worksheet for an entry if assigned, needs styling