chinese screenshots
fail if we cannot find the category, or template cannot be saved
chinese categories#
Merge branch 'master' into feature/issue89
we handle the restoration of instance state in oncreate, in order to have information available earlier when we determine if we switch the account buttons