++++
Merge remote-tracking branch 'origin/master'

Conflicts:
	application/views/users_interface/centerdocs.php
++++++++