VERSION => 2.2
Merge branch 'master' into beta
new resource strings
Merge branch 'master' into beta
Z => S
Merge branch 'master' into beta
new auth actions
code simplification
cleanup
Merge branch 'master' into beta