Merged Master into dev
MovieScaper cleaned up
Merge branch 'dev'

Conflicts:
	src/MovieScraper.py