updated
fixed one bug created new bug
fixed login bug
merge resolved
Merge branch 'Development' into logoutbug
updated