september
Merge remote-tracking branch 'origin/master'

Conflicts:
	candlemaker/models.py
	candlemaker/static/scss/_angular-foundation.scss
	candlemaker/static/scss/_custom.scss
	candlemaker/static/scss/_settings.scss
	candlemaker/static/scss/app.scss
	setup.py