SQUASH THIS: First progress on new FriendList API
SQUASH THIS: Default implementation for FriendList, begin refactoring
callbacks
SQUASH THIS: More progress on friendapi rewrite
SQUASH THIS: More friend api. Add possibility to update friends list manually
SQUASH THIS: Remove testing client for now. A reference implementation will be implemented soon, and the test
folder should be used for unit tests
SQUASH THIS: Update friend list when callbacks are received, java code
SQUASH THIS: Update friendlist on callbacks, C code
Refactoring.
Merge branch 'upstream/friendapi'
Merge branch 'upstream/master'

Conflicts:
	CMakeLists.txt
	src/im/tox/jtoxcore/JTox.java
Merge branch 'upstream/master'