Merge branch 'development' into staging
Merge branch 'staging' of github.com:amitamb/screenjs-proxy into staging
Fixed issue with IE causing port to be part of normal https url host
Merge branch 'development' into staging
Not including html2canvas anymore
Merged changes from github
Merge branch 'development' of github.com:amitamb/screenjs-proxy into development
Merge branch 'development' into staging
Merge branch 'staging'