use jbuilder for json returns
Merge branch master into api
Merge pull request #17 from rebyn/api

use jbuilder for json returns