.
Merge branch 'master' of git://github.com/flavour/eden

Conflicts:
	private/templates/CSN/tasks.cfg