zzz
Merge branch 'oauth' of github.com:ladesopeklo/cms into oauth