UPR conversion update
Merge branch 'master' of https://github.com/campminder/client_api_libs

Conflicts:
	UPRConverter/UPRConverter.v12.suo