fixing bootstrap layout stacking
Merge branch 'ktaboh'
adding bootstrap layout
Merge branch 'yi_connection'
bug fix 1