Finished move to bootsrap 3.0
Merge branch 'staging'