Merge origin/origin

Conflicts:
	models/admin/manage_students.php
	views/admin/manage_students.php

Completed with ADD Student admin
changes in manage_students.php and .js files in view and models foilder