Changed the way multi-versions are supported.
Merge branch 'master' of github.com:tyteen4a03/3ps_cmfu

Conflicts:
	upload/library/ThreePointStudio/CustomMarkupForUser/TemplateHelpers/12.php