add support for bootstrap 3, use bs_version parameter
Merge branch 'origin/master'