Merge pull request #1 from ltfschoen/20140508

Merged
Merge pull request #2 from ltfschoen/20140508

Merge
Merge pull request #3 from ltfschoen/20140508

Merge
Merge pull request #4 from ltfschoen/20140508

Merge
Merge pull request #5 from ltfschoen/20140508

Merge
Merge pull request #6 from ltfschoen/20140508

Merge
Merge pull request #7 from ltfschoen/20140508

Merge
Merge pull request #8 from ltfschoen/20140508

Merge
Added Remove Friend functionality with conditional
Merge remote-tracking branch 'origin/master' into 20140508
Added Remove Friend functionality with conditional