Not including html2canvas anymore
Merge branch 'development' of github.com:amitamb/screenjs-proxy into development