added logic to handle backend
Merge branch 'master' into client-angular4
Merge pull request #4 from ewernqvi/client-angular4

Client angular4