Merge branch 'master' of github.com:frigg/frigg into build-workers

Conflicts:
	frigg/builds/models.py