checkin missing files and fixed bootstrap collapse bug
Merge remote-tracking branch 'origin/master'