change directory name
First FT specced out in comments, and now uses unittest
Merge branch 'develop' of github.com:leehosung/writing_sandbox into develop

Conflicts:
	functional_tests/functional_tests_admin.py
	functional_tests/functional_tests_user.py