Removed Bootstrap and Jquery
Merge fix