update db
Merge branch 'master' of https://github.com/bbuchsbaum/FROIAtlas

Conflicts:
	data/FROIAtlas.sqlite
added clustering functions
added tal2mni
changed DESCRIPTION

Merge branch 'master' of https://github.com/bbuchsbaum/FROIAtlas

Conflicts:
	DESCRIPTION