Changed nose tests to django-pytest
Change test_user name
Merge remote-tracking branch 'origin/master' into FCS-20

Conflicts:
	.travis.yml
	fcs/fcs/manager/tests.py
Update tests