no message
Merge branch 'master' of https://github.com/ThomasWilhelmSybit/angularjslabday
Merge branch 'master' of https://github.com/ThomasWilhelmSybit/angularjslabday

Conflicts:
	partials/todo-detail.html
Merge branch 'master' of https://github.com/ThomasWilhelmSybit/angularjslabday