Changed location of supporting js files
Updated script urls
Updated static script url to reflect production url of proxy
Merge branch 'development'
Updated proxy for production
Merge branch 'development'
Merge branch 'development'
Merge branch 'development'
Merge branch 'development'
Started including html2canvas
Merged dev branch to have non-conflicting constant name
Fixed some merge conflicts
Merged changes from development
Fixed merge conflicts
Merge branch 'master' of github.com:amitamb/screenjs-proxy
Merge branch 'development'
Merge branch 'development'
Merge branch 'development'
Merge branch 'development'
Using production urls