added jquery mobile
fixed merge conflict in gemfile.lock