Rm conflicted files; Fix get_fieldvalues import
Merge pull request #358 from dblommesteijn/fix/simplestore-rename

Simplestore rename to B2share fix conflicts