Merge branch 'master' of https://github.com/Team-14-CodeForGood2014/Cherie-Blair-Foundation-Marketplace
Merge branch 'master' of https://github.com/Team-14-CodeForGood2014/Cherie-Blair-Foundation-Marketplace