ticket:1 added FIXTURE_DIRS to settings.py
Merge branch 't1_profile_home'

Conflicts:
	django_hello_world/settings.py