using public url for puppet submodule so heroku won't crash
changed url of paperclip repo
Merge remote-tracking branch 'origin/master' into develop-ja