Merge pull request #45 from fahadhatib/develop

Updates from webERP
New login screen adding social icons
Merge pull request #46 from MarthaMadjack/develop

New login screen adding social icons