Merge pull request #25 from wamberg/feature/new_datamodel

Feature/new datamodel
Update home page template for bootstrap.
Upgrade bootstrap from 2.2.2 to 2.3.2.