restore version w/o phonegap
merge with server