some changes in Account
Merge branch 'master' into profile6
Merge pull request #88 from lukaswelte/profile6

Profile6