Implemented Deal/Wish/Post workflow
lot of fixes for deals/wishes templates
Merge remote-tracking branch 'upstream/master'