Merge branch 'develop' into develop-4

Conflicts:
	version.txt
adding ability to remove items
adding funcitonality for deleting of filter groups
Working through finishing css details
Merge branch 'feature-bs3-collections' of https://github.com/ten24/Slatwall.git into feature-bs3-collections-accordian
allowing backend to support empty filterGroups
Still working on getting the images tab fixed
adding dateTime filters to displayValue auto populating values for
string and boolean
maintaning ui state in db
discovered bug where Defined Not defined were coded dyslexic
null changes
do not wipe string on condition change
fixing double click issue with navbar
Fixed listing display table header
Merge branch 'feature-bs3-collections' of https://github.com/ten24/Slatwall.git into feature-bs3-collections-accordian
fixing double click issue with navbar
Merge branch 'feature-bs3-collections' of https://github.com/ten24/Slatwall into feature-bs3-collections
Merge branch 'feature-bs3-collections' of https://github.com/ten24/Slatwall.git into feature-bs3-collections-accordian
fixing navbar
prepopulate date info