Modified subject to use decorate/undecorate
Merge branch 'master' of https://github.com/libris/kitin

Conflicts:
	static/js/services/services.js