merge branch googlestorage in dev
-googlestorage.properties removed, only one properties file (conf.properties) in resource/.../vault
-plugin mojo (properties) removed
conf.properties added