Merge branches 'develop' and 'feature/friendlist' of https://github.com/FAForever/lobby into feature/friendlist

Conflicts:
	res/client/client.ui
	res/notification_system/dialog.ui

Friendlist set to not checked by default. Folder.png is now in friendlist resources.
Merge branch 'feature/friendlist' of github.com:FAForever/lobby into feature/friendlist