update button order
update confidential button and add password button
Merge branch 'master' of github.com:tutao/tutanota