Added files module.
Merge remote-tracking branch 'origin/master'

Conflicts:
	testproject/tests/tests/__init__.py