Updated gems
Merge branch 'working' of github.com:mariochavez/community into working

Conflicts:
  Gemfile.lock
Merge branch 'working' of github.com:mariochavez/community into working
Merge branch 'working' of github.com:mariochavez/community into working
Merge branch 'working' of github.com:mariochavez/community into working
Remove unneeded file