Supporting Bootstrap and js fixes#15

KhodorAmmar wants to merge 2 commits intoperifer:masterperifer/timePicker:masterfrom

KhodorAmmar:masterKhodorAmmar/timePicker:masterCopy head branch name to clipboard