merged facets into master

Conflicts:
	doc/source/core.rst
	tests/deprecation_tests.py
fix docstrings for facets