merge with local non phonegap version
merge with local version
sublime project file