fixed bootstrap include and carousel width
moved the composer file to root
Merge remote-tracking branch 'upstream/master'
Composer updated.