Step 4 - WIP
Merge branch 'master' of https://github.com/boker/Angular-Survey