file upload now part of test
remove leftover debug code
check that restore is valid
Merge branch 'master' into dev
bumped version
fixed comments
added icons
Merge branch 'master' into dev