Reseted and commited changes from 3 last commits.
Merge branch 'master' of https://github.com/VBoden/tasks_hybris