Formatted base.js
Update
Merge remote-tracking branch 'origin/work'
Merge remote-tracking branch 'origin/work'
Sorted out non conflict ...

conflict was just indents