refactored imports
reformatted code
reformatted code
modified test to check save on post
removed current_values from class definition
Merge remote-tracking branch 'upstream/devel' into devel

Conflicts:
	CIM_Questionnaire/questionnaire/views/views_edit.py
Merge pull request #45 from NCPP/devel

...