Merge branch 'master' into issue54-docker-support

Conflicts:
	frigg/builds/models.py
	frigg/settings/base.py
	requirements.txt