client side
the new look 260314
Merge branch 'master' of https://github.com/AvivFlorian/SanchoRepository