Merge pull request #638 from uProxy/freedom_0.6

Freedom 0.6
get rid of extra files in popup.html