Bugfix passowrd edition
Merge branch 'trunk' of https://github.com/demonofshadow/ASAV into james
Several labels updated.