Option to assign option to images issue #1949
Merge branch 'develop' into feature-imageupdates
few minor fix
Loyalty program fixes based upon tasks created in teamwork from the
internal demo
Closes #1948
Added remoteID to image
Minor update from 2.1 to 3.1 fix, and fix for fresh install
Updated Version 3.1.16
Merge branch 'master' into develop

Conflicts:
	version.txt
Merge remote-tracking branch 'origin/develop-loyaltyfixes' into develop
Merge remote-tracking branch 'origin/feature-imageupdates' into develop
Updated Version 3.1.16.028
Updated attribute Value to also have audit dates
Updated Version 3.1.16.029
Merge branch 'develop' into develop-products

Conflicts:
	config/dbdata/SlatwallType.xml.cfm
	model/entity/AttributeValue.cfc
Closes #1883
Updated Version 3.1.16.030
Fixes client side hibachi scope to work without routes
Merge branch 'master' into hotfix
Updated Version 3.1.17