dfadsf
Merge branch 'master' of //VMW7X64/Shared_Files/RamKitEthos

Conflicts:
	Client/common/views/includes/home.html
flushed out macro factor validation