.
Merge branch 'master' of github.com:jarno-steeman/managersjs

Conflicts:
	components.js
	index.html
	observables.js
	promises.js
	todo/component.js
	todo/template.html