Fix
Merge branch 'master' of http://github.com/soleusrex/4131

Conflicts:
	assign7/ProxyCache/0
	assign7/ProxyCache/1
	assign7/ProxyCache/2