Fix issue 1-5,10
Merge branch 'master' of github.com:rotev/amnon-front