fix bug 741604
Merge branch 'fix_bug_741604' of github.com:ahmontero/mozillians into fix_bug_741604

Conflicts:
	apps/phonebook/tests/test_views.py