Merge branch 'devel', remote-tracking branch 'upstream/devel' into devel
1. Refactored tests to include a tests package under questionnaire
   with a hierarchy mirroring the package structure of the app
Merge branch 'test-refactor' of https://github.com/NCPP/esdoc-questionnaire into NCPP-test-refactor

Conflicts:
	CIM_Questionnaire/questionnaire/tests.py
Merge branch 'NCPP-test-refactor' into devel