Version 3.0 [WIP]
Merge remote-tracking branch 'origin/master'

Conflicts:
	classes.py
	mocks.py
	parsers.py
	scrapeff.py