-added log in/ log out feature
Merge branch 'dev2' of https://github.com/meirianto/swatbarter into dev2

-merging meiri's code