Merge branch 'hotfix/updates'
Add note about holiday orders
Add new PaperFaces portrait
Add rake deploy task
Merge branch 'hotfix/updates' into develop