Start creating capistrano task to upload content
Fix merge conflicts
Merge branch 'release' of github.com:fairnopoly/fairnopoly into release
Refactor rake content:upload task
Merge branch 'release' of github.com:fairnopoly/fairnopoly into release