Finish transition from Brazil to Andromeda
Merge branch 'master' of https://github.com/andrejbauer/andromeda

Conflicts:
	andromeda/apply.mli