removed appengine-web.xml, replaced with sample
Merge remote-tracking branch 'origin/master'