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