updated resources
updated action names
Merge branch 'master' into beta
resources synchronisation
Merge branch 'master' into beta