updates
updates

Conflicts:
	www.silipint.com/config/default.js
updates to paging