fixed merge conflicts (alex)
callback function working
re-orged papi structure
economic.js done
Fix merge conflicts master..alex
Clean merge conflicts master..pari
fixed census.js
Merge branch 'plingampally'
Fix conflicts