prod/dev settings
Merge branch 'master' of github.com:FabLabUTC/fablab.utc.io

Conflicts:
	settings/dev.py