Merge pull request #241 from felipewmartins/master

Migrated to bootstap. Issue #118
New layouts migrated to bootstrap. Issue #118