Don't commit build dir
Merge remote-tracking branch 'upstream/master'
Merge branch 'master' of github.com:plaindocs/sourcefabric-development

Conflicts:
	.gitignore