edit
Merge remote-tracking branch 'origin/mele'

Conflicts:
	Web App/mele/_class/db_funct.php
	Web App/mele/student.php
	Web App/seini/Login2.php

shell merging