#33 - Course page [theme]: theming course page, download button
Merge branch '33_task' into testing

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