Merge branch 'prod' into 33_task

Conflicts:
	sites/all/modules/features/gfs_feature_commerce/gfs_feature_commerce.features.field_instance.inc
	sites/all/modules/features/gfs_feature_commerce/gfs_feature_commerce.info
#33 - Course page [theme]: added views - similar courses, block - course slideshow
Merge branch '33_task' into testing

Conflicts:
	sites/all/modules/features/gfs_feature_commerce/gfs_feature_commerce.features.field_instance.inc
	sites/all/modules/features/gfs_feature_commerce/gfs_feature_commerce.info