Devid_Has_Pushed
Devid_Has_Pushed
Devid_Has_Pushed
Devid_Has_Pushed
Devid_Has_Pushed
Merge origin/master

Conflicts:
	application/controllers/archive/access.php
	application/controllers/assessment/assess.php
	application/views/archive/search/homepage.php
	application/views/templates/side_bar.php
Merge origin/master
Merge origin/master

Conflicts:
	application/controllers/archive/access.php
	application/controllers/assessment/assess.php
	application/views/archive/search/homepage.php
	application/views/templates/side_bar.php
Merge origin/master

Conflicts:
	application/controllers/archive/access.php
	application/controllers/assessment/assess.php
	application/views/archive/search/homepage.php
	application/views/templates/side_bar.php
Merge origin/master

Conflicts:
	application/controllers/archive/access.php