add comment to gemfile
fix merge conflict in gem file
Merge branch 'master' into callap