Merge pull request #646 from paczian/develop

made email2 non mandatory