removed unused imports slight code simplification
Merge branch 'devel-network' into devel

Conflicts:
	Cloudiversity.xcodeproj/project.pbxproj
	Cloudiversity/ViewControllers/Agenda/AgendaTeacherEditAssignmentViewController.m
fix crash