test
resolve conficlt
Merge branch 'master' of https://github.com/livak/PhoneGapExample