UPDATE BUG
Merge branch 'master' of https://github.com/intelhat/OOP

Conflicts:
	control_document/navigator.php
ok