switching from offers to vouchers
adding vouchers
email forms working properly on restaurants and social butterflies
add social butterfly email functionality
Merge branch 'master' of https://github.com/Siesna/food_circles

Conflicts:
	tmp/pids/server.pid