rails ckeditor
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
update show user routes to username
fix mergies
correct token colors, cleanup navbar text
navbar styles
Merge branch 'staging' into worksheet_entries

Conflicts:
	db/schema.rb