CS Fix
Moved most caching to Memcache, also cache Templates a little better.
Merge remote-tracking branch 'origin/master' into release