Add validation for the value type for simple value maps in the admin
BLC-779 : Add customCriteria property for the @AdminPresentationToOneLookup annotation
increment version to release candidate
Revert: increment version to release candidate
(72fdd5d7156d243a5308902c0d228d6461f95c96)
[maven-release-plugin] prepare release broadleaf-2.1.0-RC1
[maven-release-plugin] prepare for next development iteration
BLC-783 : In IE, a NumberFormatException is thrown when you try to persist an @AdminPresentationToOneLookup annotated field
BLC-785 : ListGrid header menu buttons don't show up (FireFox, IE)
handle url bookmarking for all browsers, including those that don't maintain the anchor portion of the url (like IE)
gracefully handle the case where the anchor portion of the url is removed while in the admin - threw an NPE before
Fix exception when launching html editor in the admin
BLC-792 : Criteria are not saved in the OrderItem rule builder in the Pages screen of the admin
BLC-789 : In StructuredContent and Pages in the CMS, changing the contentType or pageTemplate does not cause the form to be updated
BLC-504 - adding conditional admin-ie.css file to fix the overlapping header in the main content view
BLC-789 : In StructuredContent and Pages in the CMS, changing the contentType or pageTemplate does not cause the form to be updated
(cherry picked from commit 3b849b40e925a3649a5a7d0b80dc439f586cbdce)

Conflicts:
	admin/broadleaf-contentmanagement-module/src/main/java/org/broadleafcommerce/cms/admin/client/presenter/structure/StructuredContentPresenter.java
	admin/broadleaf-open-admin-platform/src/main/java/org/broadleafcommerce/openadmin/client/dto/BasicFieldMetadata.java
	admin/broadleaf-open-admin-platform/src/main/java/org/broadleafcommerce/openadmin/client/dto/override/FieldMetadataOverride.java
	admin/broadleaf-open-admin-platform/src/main/java/org/broadleafcommerce/openadmin/server/dao/Metadata.java
BLC-792 : Criteria are not saved in the OrderItem rule builder in the Pages screen of the admin (cherry picked from commit f004cc2)
Merge remote-tracking branch 'remotes/origin/BroadleafCommerce-2.0.x' into BroadleafCommerce-2.1.x
BLC-789 : In StructuredContent and Pages in the CMS, changing the contentType or pageTemplate does not cause the form to be updated
Merge remote-tracking branch 'remotes/origin/BroadleafCommerce-2.0.x' into BroadleafCommerce-2.1.x
BLC-789 : In StructuredContent and Pages in the CMS, changing the contentType or pageTemplate does not cause the form to be updated

Merge remote-tracking branch 'remotes/origin/BroadleafCommerce-2.1.x' into develop

Conflicts:
	admin/broadleaf-contentmanagement-module/src/main/java/org/broadleafcommerce/cms/admin/client/presenter/pages/PagesPresenter.java
	admin/broadleaf-contentmanagement-module/src/main/java/org/broadleafcommerce/cms/admin/client/presenter/pages/PagesPresenterExtractor.java
	admin/broadleaf-contentmanagement-module/src/main/java/org/broadleafcommerce/cms/admin/client/presenter/structure/StructuredContentPresenter.java
	admin/broadleaf-open-admin-platform/src/main/java/org/broadleafcommerce/openadmin/client/dto/BasicFieldMetadata.java
	admin/broadleaf-open-admin-platform/src/main/java/org/broadleafcommerce/openadmin/server/dao/Metadata.java