Update GAE SDK to 1.9.3
tidy up whitespace
Merge branch 'feature/p1.5' into develop