Friend List Functions

Added a function to return the friends list, as well as two more helper
functions
Merge remote-tracking branch 'origin/master'

Conflicts:
	Server/src/main/DatabaseAccess.java