Refactored some of the base object to allow for improvements in
performance and also the SmartList
Merge branch 'develop' into feature_smartlist
Merge branch 'develop' into feature_smartlist
Merge branch 'develop' into feature_smartlist
fix for incorrect account getting set in subscription issue #910
Hotfix for bug in subscriptions
Merge branch 'master' into develop

Conflicts:
	version.txt
Merge branch 'develop' into feature_smartlist
Merge branch 'develop' of https://github.com/ten24/Slatwall.git into develop
Updated Cascade of Address
Hotfix for issue #907
Merge branch 'master' into develop

Conflicts:
	version.txt
Merge branch 'develop' into feature_smartlist
hot fix for issue #907
Updated Smart List
Merge branch 'master' into develop

Conflicts:
	version.txt
Merge branch 'develop' of git@github.com:ten24/Slatwall.git into develop
Merge branch 'master' into develop

Conflicts:
	version.txt
Merged changes
Smart List Bugfixes