new set
Merge branch 'master' of heroku.com:socialodonto

Conflicts:
	social_odonto/settings.pyc
...
...
...
....