Merge branch '53_task' into prod
#33 - Course page [theme]: theming course page.
#33 - Course page [theme]: fixed download / shipping buttons
Merge branch '33_task' into testing

Conflicts:
	sites/all/modules/features/gfs_feature_commerce/gfs_feature_commerce.features.field_base.inc
	sites/all/modules/features/gfs_feature_commerce/gfs_feature_commerce.features.field_instance.inc
	sites/all/modules/features/gfs_feature_commerce/gfs_feature_commerce.field_group.inc
	sites/all/modules/features/gfs_feature_commerce/gfs_feature_commerce.info
	sites/all/modules/features/gfs_feature_commerce/gfs_feature_commerce.strongarm.inc
	sites/all/themes/lumi/styling/css/custom.css