Merge pull request #17 from tonycchung/next_mentorship

Next mentorship - add pending 'friend' requests between users.
fix to show edit form, still needs work
Fix edit view to sync with github master so we can merge automatically when pushing this branch.