bootstrap conversions
bootstrap-conversion
fix conflicts in bootstratp merge
add booticon