ticket:9 added test
ticket:9 edited test
Merge remote-tracking branch 'origin/t9'

Conflicts:
	apps/hello/tests.py