Renamed lifestuff_vault to vault.
Merge branch 'next' into vault