update
Merge branch 'master' of git@github.com:astrodoo/FLASH_IDL

Conflicts:

	sphere/recoll.pro