added common submodule, modified controller.php