Apply some of the code tweaks from the boostrap3 work to the main develop branch
Some additional tweaks from the bootstrap3 code work
Merge branch 'develop' into revisions