still cleaning up
Merge branch 'dev' of github.com:ergdev/delphi into dev
getting friend requests to work