Merge pull request #6 from reckart/master

Merge back into my own line
Merge pull request #7 from reckart/master

Merge Richard's release stuff
Update NOTICE.txt

Added the Umbrella FP7 grant details to acknowledge that this is part of PaNData.
Merge pull request #7 from spaetow/master

Added PaNData FP7 information to NOTICE.TXT