shared documents modified and working
Conflicts:
	application/controllers/archive/access.php
Merge origin/master
shared documents modified and working
Conflicts:
	application/controllers/archive/access.php
Merge origin/master