Merge commit.
Updated IndexView.js . Merged MArkus and Dans code
Merge branch 'master' of https://github.com/OccupOS/OccupOS