Merge branch '114_email_confirmation' into 'develop'