Continued at Simza, starting bookmarks.
Merge branch 'dev_taxus' of dandy:/src/script-mpe into dev_taxus

Conflicts:
	taxus/core.py