Merged files from M3 to Master

Fixing welcome screen register button