Update todos
Merge branch 'mdg-todos' into devel

Conflicts:
	examples/todos/.meteor/release
	examples/todos/lib/router.js