Merge branches 'master' and 'dev'
Merge branches 'master' and 'dev'
enabled the join button when both the fields are valid
Merge branches 'dev' and 'master' into dev