refactoring the media directory to do away with marco-proto and simplify marco/assets
updating bootstrap from 2.0.4 to 2.3.2
merging media changes into next-release