Rollback Prab's merge

after 'paypal and find doctor files' commit
Merge branch 'master' of https://github.com/s-savoia/MICsGroup