Included profiles
Merge remote-tracking branch 'origin/master'

Conflicts:
	HomebrewSite/__pycache__/settings.cpython-34.pyc
	HomebrewSite/settings.py

	modified:   HomebrewSite/settings.py
	modified:   homebrew/models.py