Initial groundwork for circles
JSON bug fix
Scoping fix
Some visial improvements for the Friends UI
Majority of circles functionality added
Merge branch 'Friends'