Finished merging master to Phonegap integration