House Cleaning + Update jollyday version
Added UserGateway for GAE