Merge branch 'phonegap', remote-tracking branch 'origin' into phonegap
prepare for phonegap
prepare for phonegap
'phonegap'