various changes
Merge branch 'master' of ssh://github.com/timini/chromo9

Conflicts:
	data/dump.sql