Refactored the on liner
Fixed conflicts
Merge branch 'master' into user
User changes, but failing tests
Merge branch 'master' of https://github.com/raulmatei/eportal into user
Fixed conflcits
Added user_test.js
Merge branch 'user' of https://github.com/raulmatei/eportal into user
Updated user acceptance test.
Implemented edit User
FIxed conflicts
fixed conflicts