Merge pull request #131 from mshamash/master

Linking
Merge pull request #132 from mshamash/master

Bug fixes with search + friend system.
Merge pull request #133 from mshamash/master

Updates, fixes, cleanup, linking.
Avoiding merge conflicts.
Merge pull request #21 from stephandev/master

Avoiding merge conflicts.