Files are now stored in a datadir.
Merge branch 'master' of github.com:VideoAG-RWTH/automatisierung

Used robin's version
Conflicts:
	uploader/identify.py