import now checks for a version string into the manifest
Merge remote-tracking branch 'baasbox/master'
merge with baasbox trunk
fix test
Merge pull request #76 from swampie/master

Import/export with manifest file.