merge functionality from various branches
Merge branch 'master' of http://github.com/nebt33/SocialDJ

Conflicts:
	Server/FolderList.cpp