Merge branch 'scaling-down-if-cpu-mem-maxed-out' of https://github.com/shatterednirvana/appscale into testing
Merge branch 'testing' of https://github.com/AppScale/appscale into testing
Merge branch 'testing' of git://github.com/AppScale/appscale into testing
Merge branch 'dont-interpret-zero-data-as-no-data' of https://github.com/shatterednirvana/appscale into testing
Merge branch 'testing' of https://github.com/AppScale/appscale into testing
Merge branch 'testing' of git://github.com/AppScale/appscale into testing
Merge branch 'testing' of github.com:AppScale/appscale into testing
fix of serving static dirs
Merge pull request #635 from nlake44/nginx_fix

Nginx fix for static_dir