merge "glossary of frameworks" into "tools"
merge "glossary of frameworks" into "tools"

also update and remove some out-of-date info
uProxy/uproxy,jpevarnek/uproxy,jpevarnek/uproxy,jpevarnek/uproxy,uProxy/uproxy,uProxy/uproxy,uProxy/uproxy,uProxy/uproxy,jpevarnek/uproxy,jpevarnek/uproxy