merges master (so, no sfa-cm anymore)
[sfa.git] / sfa / __init__.py