fixed merge conflicts (alex)
Add google_places.js module
callback function working
re-orged papi structure
economic.js done
Fix google module
Fix merge conflicts master..alex
Clean merge conflicts master..pari