Function Cleanup in Manager.js, index.php
Merge branch 'prod' of https://github.com/ssachan/v2 into prod