merge
Merge branch 'master' into develop
new todos
insert grunt todo and styling the todo-report