Merge branch 'master' of https://github.com/unbxd/docs

Conflicts:
	_build/doctrees/environment.pickle
	_build/doctrees/feed.doctree
	_build/doctrees/feed_actions.doctree
	_build/doctrees/feed_csv.doctree
	_build/doctrees/feed_full_import.doctree
	_build/doctrees/index.doctree
	_build/doctrees/search_integration.doctree
	_build/html/_sources/search_integration.txt
	_build/html/searchindex.js
git stash
Merge branch 'master' of https://github.com/unbxd/docs