fix assets display in player
newline
Merge pull request #92 from asmacdo/dev

fix player for javascript assets
pulled is valid from init in render, pulled assets from mako in render
Fixed view_file conflict and merged
reverse accidental change
reverted navbarheight change
merged with upstream, no conflicts
Hack solution to navbar mis-alignment, work but needs a better implementation