Merge branch 'master' of github.com:cbron/catapult-rails
Merge branch 'master' of github.com:cbron/catapult-rails