Update requirements file
Merge branch 'master' into 0.4

Conflicts:
	requirements.txt