Merge branch 'release/shopper-1.1'
added unicorn
added unicorn config
fix conflict for merge