Save favorites to json
Default value for password field
Merge remote-tracking branch 'upstream/master' into savepass

Conflicts:
	src/script/lua_api/l_mainmenu.cpp
	src/serverlist.cpp
	src/serverlist.h