Updated templates to use bootstrap 3.
Merge remote-tracking branch 'origin/master'