Further refactoring capistrano content upload
Fix merge conflicts
Merge branch 'release' of github.com:fairnopoly/fairnopoly into release