Merge origin/ni.1.2V2

Conflicts:
	web/interfaces/teacher/list_5.xhtml
Merge origin/ni.1.2V2

Conflicts:
	web/interfaces/teacher/list_5.xhtml
Merge origin/ni.1.2V2

Conflicts:
	web/interfaces/teacher/list_5.xhtml
Merge origin/ni.1.2V2

Conflicts:
	web/interfaces/teacher/list_5.xhtml
Merge origin/ni.1.2V2

Conflicts:
	web/interfaces/teacher/list_5.xhtml