Merge branch 'release/0.4.0' into develop
Removed bogus log folder
Added new identity_resource field to templates. Updated base store to sync better.
v0.4.1
Merge branch 'release/0.4.1'