js indent updates
fix merge conflicts
updated .gitmodules