Update pagination;
Merge branch 'master' of https://github.com/gitTest123456/beauty

Conflicts:
	src/main/webapp/clients.html
	src/main/webapp/js/clients.js
Remove incorrect files - after merge
update js level