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