6.1 display object edits
moving bootstrap elements to footer
Merge branch 'develop' of git://github.com/blueriver/MuraCMS into develop
Merge pull request #1042 from stevewithington/develop

6.1 display object edits