Update versions
Merge branch 'master' of github.com:mariochavez/community

Conflicts:
  Gemfile.lock