Merge pull request #84 from wmathurin/unstable20

Moving to latest jquery and jquery.mobile
Merge pull request #85 from wmathurin/unstable20

Conflct detection changes