def unicode instead of str
Merge branch 'bugfix/UnicodeAdmin' into stage
Merge branch 'stage'