added tests for setup initialization
Merge remote-tracking branch 'upstream/devel' into devel

Conflicts:
	CIM_Questionnaire/questionnaire/tests.py
Merge pull request #38 from NCPP/devel

Devel