Further GAE fixes
Fix for GAE performance issue and also segregation issue (theme images)
More GAE Work; put on freeze until Google can fix a very nasty production bug