fix boostrap css importing
Merge remote-tracking branch 'origin/master'
Update template from 1.1 to 1.3