migration to django 1.6
Merge branch 'master' of https://github.com/mateifl/djsocial
Merge branch 'master' of https://github.com/mateifl/djsocial

Conflicts:
	djsocial/settings.py
	djsocial/urls.py