Typo fixes
Merge branch 'user' of https://github.com/pi-engine/pi into user

Conflicts:
	usr/custom/user/src/Field/Subscription.php
Merge branch 'user' of https://github.com/pi-engine/pi into user
Merge branch 'user' of https://github.com/pi-engine/pi into user
File/form name adjustment