change the return ok type to json
change the timeout to 10 sec
Merge branch 'master' of github.com:cmusv-sc/ArchF2013-Project3-FT