Merge
Merge branch 'master' of https://github.com/yorg76/test.git

Conflicts:
	application/classes/Document.php