Code scaffolding prepared for boostrap3
fake commit
Merge branch 'master' into clients

Mergin the bootstrap templates from master branch.
Update Clients model and bootstrap templates