added SAPhalcon in header, removed email confirmation for account creation
Fixed merge conflict