Upgrade UNL_Services_CourseApproval-0.5.2
Merge branch 'master' into 4.0_template

Conflicts:
	includes/.pear2registry
	includes/.xmlregistry/packages/pear.unl.edu/UNL_Services_CourseApproval/0.5.2-info.xml