Merge remote-tracking branch 'origin/master'

Conflicts:
	System-Design-Project/public_html/auth/application/controllers/administration.php
	System-Design-Project/public_html/auth/application/models/auth_model.php
	System-Design-Project/public_html/auth/application/views/templates/main_template.php
holds added
admin majors
fixed search