Pandora::Block Implement type and definition properties
Pandora::File set block type upon creation
Merge branch 'master' of github.com:G-Node/pandora

Conflicts:
	src/File.cpp