Merge branch 'master' of https://github.com/eaudeweb/cms.themes
Merge branch 'master' of https://github.com/eaudeweb/cms.themes
Upgraded from Bootstrap v2.x to v3.x.
Merge branch 'master' of https://github.com/eaudeweb/cms.themes
Merge pull request #143 from cdog/master

Upgraded from Bootstrap v2.x to v3.x