fixed toshi ERROR
Merge branch 'master' of https://github.com/blin17/PennApps2013
added web support