Merge branch 'develop' into Features/block_todolist
+ Added front-end for todoblock
Merge branch 'Features/block_todolist' into develop