Commited changes
Merge branch 'master' of https://github.com/irunguh/portal
frontend and backend eia
Merged conflicts
Changes after merge