Fix
Update json files
Update configs
Update make
Update phonegap config