conflict resolution testing
Merge branch 'master' of https://github.com/reurgency/PhoneGapBuildBase