Upgraded to the latest verion of twitter bootstrap
Merge branch 'master' of github.com:andrefuller/AppleTrailerViewer

Conflicts:
	js/models/trailer.js