Update conflict script style of zIndex with Bootstrap Modal
Update conflict script style of zIndex with Bootstrap Modal again
Merge remote-tracking branch 'Lytay-CLTAG/master'