updating placeholders for criteria
Added in the fonts required to default.cfm
fixing javascript bug with editing. making collection type disabled
input. Merging display options code
Fixed all of the crud buttons displaying in tables
Merge branch 'feature-bs3-collections' of https://github.com/ten24/Slatwall.git into feature-bs3-collections-ds
Added pagination classes back into integration view