add new code
Merge branch 'dev' of github.com:singerinsky/faq_server into dev

Conflicts:
	unit_test/test_client.py