Continued to add requirements and base settings
Merge remote-tracking branch 'origin/master'

Conflicts:
	requirements/_base.txt