Merge branch 'master' of github.com:frigg/frigg into clean

Conflicts:
	frigg/builds/admin.py