Merge branch 'master' of https://github.com/agh-glk/fcs

Conflicts:
	docs/source/crawler/crawler.rst
	docs/source/manager/api_views.rst
	docs/source/manager/apiurls.rst
	docs/source/manager/models.rst
	docs/source/manager/urls.rst
	docs/source/server/link_db.rst