Completely ported imports for proper app engine use.
Merge branch 'dev'