Modifications in an intermediary file
Merge branch 'master' of github.com:lafkon/conversations

Conflicts:
	var/layouts/futuretools-02/futuretools-01_03.svg