updated resources
updated action names
Merge branch 'master' into tags-master
resources synchronisation
Merge branch 'master' into tags-master