:clean
:Merge branch 'master' of https://github.com/agnieszkapaszkowska/mega-ankieta

Conflicts:
	django_app/iss/db.sqlite3
	django_app/iss/iss/surveys/iterators/listsToTuplesIterator.py
	django_app/iss/iss/surveys/iterators/permutationIterator.py
	django_app/iss/iss/surveys/iterators/subsetIterator.py
	django_app/iss/iss/surveys/iterators/testIterator.py
	django_app/iss/iss/surveys/widgets/checkboxWidget.py
	django_app/iss/iss/surveys/widgets/imgWidget.py
	django_app/iss/iss/surveys/widgets/likertWidget.py
	django_app/iss/iss/surveys/widgets/pageWidget.py
	django_app/iss/iss/surveys/widgets/questionWidget.py
	django_app/iss/iss/surveys/widgets/radioWidget.py
	django_app/iss/iss/surveys/widgets/selectboxWidget.py
	django_app/iss/iss/surveys/widgets/surveyWidget.py
	django_app/iss/iss/surveys/widgets/tableWidget.py
	django_app/iss/iss/surveys/widgets/textWidget.py
	django_app/iss/iss/surveys/widgets/textareaWidget.py
	django_app/iss/iss/surveys/widgets/textinputWidget.py