Friendships

Now possible to add/remove/list your friends via the database.
Fixed mergeconflicts
Merge pull request #50 from SimonHietala/master

Friendships