update bootstrap to 2.3.1
Merge branch 'master' of https://github.com/neilhem/template
template files refactoring