change template version bootstrap2 to 3
Merge remote-tracking branch 'rt/master'