Template/jquery/bootstrap
lots of stuff.. need to fix scrollspy
 Merge commit