Merge branch 'testing' of git://github.com/AppScale/appscale into testing
serve up channel js file
public to private zk ips
Merge pull request #530 from AppScale/zk-fix

public to private zk ips
Merge pull request #522 from AppScale/requests-per-second

Requests per second
Merge pull request #528 from nlake44/channel-fix

serve up channel js file
removed setting gcthread to None
Merge pull request #531 from AppScale/zk-fix

removed setting gcthread to None
fixed where we do not map the name of queues correctly to function names
Merge pull request #532 from nlake44/tq-function-name-fix

fixed where we do not map the name of queues correctly to function names
killing other appcontroller processes from lingering deployments
Checking if cookie is valid before returning that they're logged in
killing the server instead of main djinn, since that's what we exec
Merge pull request #534 from jovanchohan/valid_login

Checking if cookie is valid before returning that they're logged in
Merge pull request #533 from shatterednirvana/appcontroller-kills-other-appcontrollers-on-bootup

killing other appcontroller processes from lingering deployments
Fixed stand alone running of the groomer
Fixed typo
Fixed typo
Fixed typo
Merge branch 'testing' of git://github.com/AppScale/appscale into testing