fixing merge with twitter bootstrap
added search bar
fixed nav menu highlights, content container
guids and api docs added for reference