Do not proxify links which do not have href attribute set
Fixed merge conflicts
Merge branch 'master' of github.com:amitamb/screenjs-proxy