Bootstrap pagination - modefied add/edit/remove entities
Bootstrap pagination - modefied add/edit/remove
merged Files
merge conflicts