small changes
Merge branch 'master' of //VMW7X64/Shared_Files/RamKitEthos

Conflicts:
	Client/common/views/includes/home.html
	Client/common/views/includes/home.jade
	Client/static/dataapi.jade
Merge branch 'master' of //vmw7x64/Shared_Files/RamKitEthos

Conflicts:
	Client/common/views/includes/home.html
	Client/common/views/includes/home.jade
	Client/static/dataapi.jade