ticket:1 using south 0.8.4
ticket:1 modify test
Merge branch 't1_contact'
Merge branch 'master' of https://github.com/dzh21/FortyTwo

Conflicts:
	requirements.txt