ticket:5 merged t5 into master
Merge branch 't5'
ticket:1 merged ticket branch into master
ticket:1 quickfix
ticket:1 list_display is a tuple originally. made it tuple in PersonAdmin also
ticket:1 implemented __str__ and __unicode__ methods on Person class
Merge branch 't1'

Conflicts:
	apps/hello/admin.py
	apps/hello/models.py
Merge branch 't3'

Conflicts:
	apps/hello/admin.py
	apps/hello/models.py
Merge branch 't4'
Merge branch 'master' into t5